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
b7fe8bba
Commit
b7fe8bba
authored
Jul 11, 2018
by
Guillaume Hervier
Committed by
Rafael Monnerat
Jul 11, 2018
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/slapos-testing: Add socat for tests (required for portredir)
parent
2f3e2cd0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
software/slapos-testing/buildout.hash.cfg
software/slapos-testing/buildout.hash.cfg
+1
-1
software/slapos-testing/instance.cfg
software/slapos-testing/instance.cfg
+1
-1
software/slapos-testing/software.cfg
software/slapos-testing/software.cfg
+1
-0
No files found.
software/slapos-testing/buildout.hash.cfg
View file @
b7fe8bba
...
@@ -15,5 +15,5 @@
...
@@ -15,5 +15,5 @@
[template]
[template]
filename = instance.cfg
filename = instance.cfg
md5sum =
9dece9d12dc94bf5c35d307cc8aa4d6b
md5sum =
37f6d8cfa54e8dacf04f13327caac208
software/slapos-testing/instance.cfg
View file @
b7fe8bba
...
@@ -74,7 +74,7 @@ command-line =
...
@@ -74,7 +74,7 @@ command-line =
# /usr/bin and /bin in $PATH
# /usr/bin and /bin in $PATH
# * LOCAL_IPV4 is needed for some slapos.core tests
# * LOCAL_IPV4 is needed for some slapos.core tests
environment =
environment =
PATH=${coreutils:location}/bin:${curl:location}/bin:${openssl:location}/bin:${git:location}/bin:${libxslt:location}/bin:/usr/bin/:/bin/
PATH=${coreutils:location}/bin:${curl:location}/bin:${openssl:location}/bin:${git:location}/bin:${libxslt:location}/bin:
${socat:location}/bin:
/usr/bin/:/bin/
LOCAL_IPV4=$${slap-configuration:ipv4-random}
LOCAL_IPV4=$${slap-configuration:ipv4-random}
...
...
software/slapos-testing/software.cfg
View file @
b7fe8bba
...
@@ -10,6 +10,7 @@ extends =
...
@@ -10,6 +10,7 @@ extends =
../../component/phantomjs/buildout.cfg
../../component/phantomjs/buildout.cfg
../../component/pycurl/buildout.cfg
../../component/pycurl/buildout.cfg
../../component/coreutils/buildout.cfg
../../component/coreutils/buildout.cfg
../../component/socat/buildout.cfg
../../stack/slapos.cfg
../../stack/slapos.cfg
./buildout.hash.cfg
./buildout.hash.cfg
...
...
Jérome Perrin
@jerome
mentioned in commit
Nicolas/slapos.core@5d0ca690
·
Dec 12, 2018
mentioned in commit
Nicolas/slapos.core@5d0ca690
mentioned in commit Nicolas/slapos.core@5d0ca690fdb343b6f3b2a2bc89c8d771fbe38d21
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