Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Guillaume Hervier
slapos-caddy
Commits
b37bccd5
Commit
b37bccd5
authored
Mar 30, 2017
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Provide full test reference, instead of only image
parent
2bea0e59
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
software/cdn-test/instance.cfg.in
software/cdn-test/instance.cfg.in
+1
-1
software/cdn-test/runTestSuite.py
software/cdn-test/runTestSuite.py
+3
-3
No files found.
software/cdn-test/instance.cfg.in
View file @
b37bccd5
...
@@ -8,7 +8,7 @@ recipe = slapos.recipe.template:jinja2
...
@@ -8,7 +8,7 @@ recipe = slapos.recipe.template:jinja2
rendered = $${buildout:directory}/bin/$${:_buildout_section_name_}
rendered = $${buildout:directory}/bin/$${:_buildout_section_name_}
template = inline:
template = inline:
#!/bin/sh
#!/bin/sh
exec ${buildout:bin-directory}/${runTestSuite_py:interpreter} ${:_profile_base_location_}/$${:_buildout_section_name_}.py --partition_path $${buildout:directory} --
image_reference "{{ slapparameter_dict.get('image-to-test-url')
}}" "$@"
exec ${buildout:bin-directory}/${runTestSuite_py:interpreter} ${:_profile_base_location_}/$${:_buildout_section_name_}.py --partition_path $${buildout:directory} --
test_reference "{{ slapparameter_dict.get('image-to-test-url') }} {{ slapparameter_dict.get('script-to-test-url')
}}" "$@"
mode = 0755
mode = 0755
context =
context =
key slapparameter_dict slap-configuration:configuration
key slapparameter_dict slap-configuration:configuration
...
...
software/cdn-test/runTestSuite.py
View file @
b37bccd5
...
@@ -51,13 +51,13 @@ def main():
...
@@ -51,13 +51,13 @@ def main():
help
=
"Path of a partition"
,
help
=
"Path of a partition"
,
default
=
os
.
path
.
abspath
(
os
.
getcwd
()))
default
=
os
.
path
.
abspath
(
os
.
getcwd
()))
parser
.
add_argument
(
parser
.
add_argument
(
'--
image
_reference'
,
'--
test
_reference'
,
help
=
"Reference of t
ested image
"
,
help
=
"Reference of t
he test
"
,
default
=
"missing"
default
=
"missing"
)
)
args
=
parser
.
parse_args
()
args
=
parser
.
parse_args
()
test_list
=
[
args
.
image
_reference
]
test_list
=
[
args
.
test
_reference
]
test_title
=
args
.
test_suite_title
or
args
.
test_suite
test_title
=
args
.
test_suite_title
or
args
.
test_suite
if
args
.
master_url
:
if
args
.
master_url
:
tool
=
taskdistribution
.
TaskDistributionTool
(
args
.
master_url
)
tool
=
taskdistribution
.
TaskDistributionTool
(
args
.
master_url
)
...
...
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