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
107
Merge Requests
107
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
03bfb57b
Commit
03bfb57b
authored
Oct 29, 2016
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
test-rina: enable build of hellorina SR
parent
24953227
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
10 deletions
+14
-10
software/build-rina/build.cfg
software/build-rina/build.cfg
+4
-7
software/build-rina/runTestSuite.in
software/build-rina/runTestSuite.in
+9
-2
software/build-rina/software.cfg
software/build-rina/software.cfg
+1
-1
No files found.
software/build-rina/build.cfg
View file @
03bfb57b
...
...
@@ -100,9 +100,8 @@ commands = install test
install =
${:apt-update}
sudo apt-get -y install librinad-dev rinad
: || {
mkdir rina-tools
cd rina-tools
mkdir software
cd software
cat <<EOF >buildout.cfg
[buildout]
extends = /mnt/slapos/software/hellorina/software.cfg
...
...
@@ -112,13 +111,11 @@ install =
setup =
[irati-stack]
repository = /mnt/rina
shared = true
[versions]
slapos.cookbook =
EOF
sed s,${buildout:directory}/,/mnt/buildout/, /mnt/buildout/bin/buildout |
python - bootstrap
MAKEFLAGS=-j${:smp} bin/buildout
}
MAKEFLAGS=-j${:smp} python -S /mnt/buildout/bin/buildout
arch=`dpkg-architecture -qDEB_HOST_ARCH`
sudo sh -c "/mnt/slapos.package/playbook/roles/rina/gen-ipcm-conf
...
...
software/build-rina/runTestSuite.in
View file @
03bfb57b
...
...
@@ -6,6 +6,7 @@ from time import gmtime, strftime, time
# What we do here is currently too new to reuse more from testsuite.
from erp5.util import taskdistribution
from erp5.util.testsuite import format_command
from zc.buildout.buildout import Buildout
{% set vm = parameter_dict['vm'] -%}
...
...
@@ -79,12 +80,18 @@ def main():
else:
test_result = DummyTestResult(dist_list)
Buildout._setup_logging = lambda self: None
fd = os.open('buildout.cfg', os.O_CREAT | os.O_EXCL | os.O_WRONLY, 0666)
try:
os.write(fd, """\
[buildout]
extends = {{parameter_dict['profile_base_location']}}/build.cfg
offline = true
relative-paths = true
""")
Buildout('buildout.cfg', {}).bootstrap(None)
os.write(fd, """\
extends = {{parameter_dict['profile_base_location']}}/build.cfg
develop-eggs-directory = {{buildout['develop-eggs-directory']}}
eggs-directory = {{buildout['eggs-directory']}}
...
...
@@ -109,7 +116,7 @@ location = {{parameter_dict['slapos_package']}}
break
dist = test_result_line.name
cmd = [
{{repr(parameter_dict['buildout'])}}
,
cmd = [
os.path.join('bin', 'buildout')
,
'vm-run-base:dist=' + dist,
'debuild-rina-base:suite=' + (publish['suite'] if publish else ''),
]
...
...
software/build-rina/software.cfg
View file @
03bfb57b
...
...
@@ -39,7 +39,6 @@ template = inline:
environment = {{dumps(environment)}}
vm = {{dumps(vm)}}
runTestSuite_py = ${buildout:bin-directory}/${runTestSuite_py:interpreter}
buildout = ${buildout:bin-directory}/buildout
profile_base_location = ${:_profile_base_location_}
irati_stack = ${irati-stack:location}
slapos_package = ${slapos.package-repository:location}
...
...
@@ -50,6 +49,7 @@ context =
[runTestSuite_py]
recipe = zc.recipe.egg
eggs = erp5.util
zc.buildout
interpreter = ${:_buildout_section_name_}
[irati-stack]
...
...
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