summaryrefslogtreecommitdiffstats
path: root/jjb/apex/apex.yaml
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-07-29 22:36:06 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-07-29 22:38:14 +0200
commit751002f537007f35a536959e4180ce7c48e18bf1 (patch)
tree7457afc20ef89479eb86bbd5f5f39be466ca750b /jjb/apex/apex.yaml
parent9d40386d93630fc726271d0f904bf9b4a1f8c071 (diff)
Select the right Functest repos when master
Else OpenStack Rocky is verified by Queens upper-contraints. Change-Id: I5bfcb4895e64ab911c1131e8bfeb09eac2775754 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'jjb/apex/apex.yaml')
-rw-r--r--jjb/apex/apex.yaml9
1 files changed, 7 insertions, 2 deletions
diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index aabe6ebc7..a4bb2be82 100644
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -546,6 +546,11 @@
abort-all-job: true
git-revision: false
- shell: |
+ if echo $DEPLOY_SCENARIO | grep queens &> /dev/null; then
+ echo 'REPO=opnfv' > functest_properties
+ else
+ echo 'REPO=ollivier' > functest_properties
+ fi
features=$(echo $DEPLOY_SCENARIO | sed -r -n 's/os-.+-(.+)-(noha|ha)/\1/p')
if [ "$features" == 'queens' ]; then
functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-queens-(noha|ha)/\1-nofeature-\2/p')
@@ -554,9 +559,9 @@
else
functest_scenario=$DEPLOY_SCENARIO
fi
- echo "DEPLOY_SCENARIO=$functest_scenario" > functest_scenario
+ echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_properties
- inject:
- properties-file: functest_scenario
+ properties-file: functest_properties
override-build-parameters: true
- multijob:
name: 'OPNFV Test Suite'