summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-10-21 10:46:54 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-10-21 10:47:42 +0200
commitc393f522640d789317fb5ba16e646071793a5bf3 (patch)
tree9c46d292b151bd8f7db50801f6c97cbbfd3b1738
parent5c575ac0657738442b06b8377d075ac00c51f5f2 (diff)
Revert "Select the right Functest repos when master"
This reverts commit 751002f537007f35a536959e4180ce7c48e18bf1. Change-Id: I4c7cef7f4296686fda70011e9bf840b114f11845 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--jjb/apex/apex.yaml9
-rw-r--r--jjb/apex/apex.yaml.j29
2 files changed, 4 insertions, 14 deletions
diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index 32dd2f749..aa9ec2c81 100644
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -577,11 +577,6 @@
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')
@@ -590,9 +585,9 @@
else
functest_scenario=$DEPLOY_SCENARIO
fi
- echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_properties
+ echo "DEPLOY_SCENARIO=$functest_scenario" > functest_scenario
- inject:
- properties-file: functest_properties
+ properties-file: functest_scenario
override-build-parameters: true
- multijob:
name: 'OPNFV Test Suite'
diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2
index 455f198f1..bd8e98abf 100644
--- a/jjb/apex/apex.yaml.j2
+++ b/jjb/apex/apex.yaml.j2
@@ -423,11 +423,6 @@
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')
@@ -436,9 +431,9 @@
else
functest_scenario=$DEPLOY_SCENARIO
fi
- echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_properties
+ echo "DEPLOY_SCENARIO=$functest_scenario" > functest_scenario
- inject:
- properties-file: functest_properties
+ properties-file: functest_scenario
override-build-parameters: true
- multijob:
name: 'OPNFV Test Suite'