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
104
Merge Requests
104
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
1c4d1452
Commit
1c4d1452
authored
May 13, 2020
by
Jérome Perrin
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/jstestnode: use a $FONTCONFIG_FILE
without valid fonts, firefox refuses to start
parent
7b3d0530
Pipeline
#9417
failed with stage
Changes
4
Pipelines
2
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
2 deletions
+20
-2
software/jstestnode/buildout.hash.cfg
software/jstestnode/buildout.hash.cfg
+2
-2
software/jstestnode/instance.cfg.in
software/jstestnode/instance.cfg.in
+15
-0
software/jstestnode/runTestSuite.in
software/jstestnode/runTestSuite.in
+1
-0
software/jstestnode/software.cfg
software/jstestnode/software.cfg
+2
-0
No files found.
software/jstestnode/buildout.hash.cfg
View file @
1c4d1452
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
[instance]
[instance]
filename = instance.cfg.in
filename = instance.cfg.in
md5sum =
ab08e75c26d06d95674042d4a2934716
md5sum =
cd8648ca8a4a098e1a6faf7246f0d395
[template-nginx-service]
[template-nginx-service]
filename = template-nginx-service.sh.in
filename = template-nginx-service.sh.in
...
@@ -27,4 +27,4 @@ md5sum = 98faa5ad8cfb23a11d97a459078a1d05
...
@@ -27,4 +27,4 @@ md5sum = 98faa5ad8cfb23a11d97a459078a1d05
[template-runTestSuite]
[template-runTestSuite]
filename = runTestSuite.in
filename = runTestSuite.in
md5sum =
5cac160fd6f14cd69cc8d63f87cc9726
md5sum =
bb3f053b6cdb0a8888e9d32e63085ed5
software/jstestnode/instance.cfg.in
View file @
1c4d1452
...
@@ -28,6 +28,21 @@ www = $${:srv}/www
...
@@ -28,6 +28,21 @@ www = $${:srv}/www
home = $${:etc}/home
home = $${:etc}/home
ssl = $${:etc}/ssl
ssl = $${:etc}/ssl
framebuffer = $${:srv}/framebuffer
framebuffer = $${:srv}/framebuffer
fontconfig-cache = $${buildout:directory}/.fontconfig
[fontconfig-conf]
recipe = slapos.recipe.template:jinja2
template = ${template-fonts-conf:output}
rendered = $${directory:etc}/fonts.conf
context =
key cachedir directory:fontconfig-cache
key fonts :fonts
key includes :includes
fonts =
${ipaex-fonts:location}
${liberation-fonts:location}
includes =
${fontconfig:location}/etc/fonts/conf.d
#################################
#################################
# Test runner
# Test runner
...
...
software/jstestnode/runTestSuite.in
View file @
1c4d1452
...
@@ -20,6 +20,7 @@ import json
...
@@ -20,6 +20,7 @@ import json
os.environ['XORG_LOCK_DIR'] = '$${xvfb-instance:lock-dir}'
os.environ['XORG_LOCK_DIR'] = '$${xvfb-instance:lock-dir}'
os.environ['DISPLAY'] = '$${xvfb-instance:display}'
os.environ['DISPLAY'] = '$${xvfb-instance:display}'
os.environ['FONTCONFIG_FILE'] = '$${fontconfig-conf:rendered}'
BASE_URL = 'http://[$${nginx-configuration:ip}]:$${nginx-configuration:port}/'
BASE_URL = 'http://[$${nginx-configuration:ip}]:$${nginx-configuration:port}/'
ETC_DIRECTORY = '$${directory:etc}'
ETC_DIRECTORY = '$${directory:etc}'
...
...
software/jstestnode/software.cfg
View file @
1c4d1452
...
@@ -5,6 +5,8 @@ extends =
...
@@ -5,6 +5,8 @@ extends =
../../component/coreutils/buildout.cfg
../../component/coreutils/buildout.cfg
../../component/git/buildout.cfg
../../component/git/buildout.cfg
../../component/xorg/buildout.cfg
../../component/xorg/buildout.cfg
../../component/fontconfig/buildout.cfg
../../component/fonts/buildout.cfg
../../component/firefox/buildout.cfg
../../component/firefox/buildout.cfg
../../component/dash/buildout.cfg
../../component/dash/buildout.cfg
../../component/nginx/buildout.cfg
../../component/nginx/buildout.cfg
...
...
Jérome Perrin
@jerome
mentioned in merge request
!735
·
May 18, 2020
mentioned in merge request
!735
mentioned in merge request !735
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