Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
105
Merge Requests
105
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
a1df3059
Commit
a1df3059
authored
Apr 22, 2020
by
Jérome Perrin
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
jstestnode: fix regression from introduction of Xvfb promise
${xvfb-instance:display} is used in in runTestSuite.in
parent
2fdbb0df
Pipeline
#9047
failed with stage
in 0 seconds
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
software/jstestnode/buildout.hash.cfg
software/jstestnode/buildout.hash.cfg
+1
-1
software/jstestnode/instance.cfg.in
software/jstestnode/instance.cfg.in
+4
-3
No files found.
software/jstestnode/buildout.hash.cfg
View file @
a1df3059
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
[instance]
[instance]
filename = instance.cfg.in
filename = instance.cfg.in
md5sum =
42e7d1825f5582fbe2c55977e5abc574
md5sum =
ab08e75c26d06d95674042d4a2934716
[template-nginx-service]
[template-nginx-service]
filename = template-nginx-service.sh.in
filename = template-nginx-service.sh.in
...
...
software/jstestnode/instance.cfg.in
View file @
a1df3059
...
@@ -53,19 +53,20 @@ recipe = slapos.cookbook:wrapper
...
@@ -53,19 +53,20 @@ recipe = slapos.cookbook:wrapper
wrapper-path = $${directory:services}/$${:_buildout_section_name_}
wrapper-path = $${directory:services}/$${:_buildout_section_name_}
command-line =
command-line =
${xserver:location}/bin/Xvfb
${xserver:location}/bin/Xvfb
:
$${:display}
$${:display}
-screen 0 1024x768x24
-screen 0 1024x768x24
-fbdir $${directory:framebuffer}
-fbdir $${directory:framebuffer}
environment =
environment =
XORG_LOCK_DIR=$${:lock-dir}
XORG_LOCK_DIR=$${:lock-dir}
display = 0
display = :$${:display-number}
display-number = 0
lock-dir = $${directory:run}
lock-dir = $${directory:run}
[xvfb-promise]
[xvfb-promise]
recipe = slapos.cookbook:wrapper
recipe = slapos.cookbook:wrapper
wrapper-path = $${directory:promise}/$${:_buildout_section_name_}
wrapper-path = $${directory:promise}/$${:_buildout_section_name_}
command-line = bash -c "[ -S $${xvfb-instance:lock-dir}/.X11-unix/X$${xvfb-instance:display} ]"
command-line = bash -c "[ -S $${xvfb-instance:lock-dir}/.X11-unix/X$${xvfb-instance:display
-number
} ]"
#################################
#################################
...
...
Jérome Perrin
@jerome
mentioned in merge request
!733 (merged)
·
Apr 22, 2020
mentioned in merge request
!733 (merged)
mentioned in merge request !733
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment