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
103
Merge Requests
103
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
79855880
Commit
79855880
authored
Sep 27, 2022
by
Xiaowu Zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/slaps-testing: re6stnet only support python2
parent
b22d8580
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
13 deletions
+19
-13
software/slapos-testing/buildout.hash.cfg
software/slapos-testing/buildout.hash.cfg
+1
-1
software/slapos-testing/instance.cfg
software/slapos-testing/instance.cfg
+10
-8
software/slapos-testing/software-py2.cfg
software/slapos-testing/software-py2.cfg
+4
-0
software/slapos-testing/software.cfg
software/slapos-testing/software.cfg
+4
-4
No files found.
software/slapos-testing/buildout.hash.cfg
View file @
79855880
...
...
@@ -15,4 +15,4 @@
[template]
filename = instance.cfg
md5sum =
446cbfe05097bf03f6b4de742fa8ab2
8
md5sum =
a8bd56d112344ae56138e3a775fec47
8
software/slapos-testing/instance.cfg
View file @
79855880
...
...
@@ -94,8 +94,8 @@ repository = ${re6stnet-repository:location}
[re6stnet-test-runner]
recipe = slapos.recipe.template:jinja2
template = inline:#!/bin/sh
#change #!/usr/bin/python2 -> #!/real_python_path/bin/python
2
sed '1s?/usr/bin/python2?${python
2.7:location}/bin/python2
?' -i ${re6stnet-repository:location}/re6st/ovpn-*
#change #!/usr/bin/python2 -> #!/real_python_path/bin/python
Version
sed '1s?/usr/bin/python2?${python
:location}/bin/python${python:version}
?' -i ${re6stnet-repository:location}/re6st/ovpn-*
# update files in /sys/class/net
mount -t sysfs sysfs /sys
...
...
@@ -119,6 +119,7 @@ recipe = slapos.recipe.template
output = $${:workdir}/.nxdtest
workdir = $${create-directory:nxdtest-working-dir}
inline =
import six
TestCase(
"kedifa",
['python', '-m', 'unittest', 'discover', '-v'],
...
...
@@ -213,12 +214,13 @@ inline =
cwd="""$${rubygemsrecipe:location}""",
summaryf=UnitTest.summary,
)
TestCase(
"re6stnet",
['unshare', '-Umnr', '$${re6stnet-test-runner:rendered}'],
cwd="""$${re6stnet:location}/re6st/tests""",
summaryf=UnitTest.summary,
)
if six.PY2:
TestCase(
"re6stnet",
['unshare', '-Umnr', '$${re6stnet-test-runner:rendered}'],
cwd="""$${re6stnet:location}/re6st/tests""",
summaryf=UnitTest.summary,
)
[runTestSuite]
...
...
software/slapos-testing/software-py2.cfg
View file @
79855880
...
...
@@ -4,3 +4,7 @@ extends =
[python]
part = python2.7
[extra-eggs]
eggs +=
${re6stnet-setup:egg}
software/slapos-testing/software.cfg
View file @
79855880
...
...
@@ -126,6 +126,9 @@ setup = ${rubygemsrecipe-repository:location}
egg = re6stnet[test]
setup = ${re6stnet-repository:location}
[extra-eggs]
eggs =
[eggs]
<= python-interpreter
eggs +=
...
...
@@ -150,12 +153,9 @@ eggs +=
${slapcache-setup:egg}
${slapos.rebootstrap-setup:egg}
${rubygemsrecipe-setup:egg}
${re6stnet-setup:egg}
zope.testing
supervisor
pathlib2
python-unshare
python-passfd
${extra-eggs:eggs}
[eggs/scripts]
recipe = zc.recipe.egg
...
...
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