summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-07-30 21:41:35 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-07-30 21:41:35 +0000
commita00d94e18f211f7d90280961decd91cf1632c448 (patch)
treeb76411b927c9850db6366db7e39ac45a09cb4a9e
parent1552a769f7f45213d8a926418b9830d8f15b2b03 (diff)
parent751002f537007f35a536959e4180ce7c48e18bf1 (diff)
Merge "Select the right Functest repos when master"
-rw-r--r--jjb/apex/apex.yaml9
-rw-r--r--jjb/apex/apex.yaml.j210
2 files changed, 14 insertions, 5 deletions
diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index b278419b8..84e29e95f 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'
diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2
index 0001e844f..4f424b6df 100644
--- a/jjb/apex/apex.yaml.j2
+++ b/jjb/apex/apex.yaml.j2
@@ -416,6 +416,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')
@@ -424,9 +429,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'
@@ -1116,4 +1121,3 @@
name: 'apex-danube'
triggers:
- timed: '0 3 1 1 7'
-