summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-07-20 11:17:19 -0400
committerTim Rozet <trozet@redhat.com>2018-07-20 11:17:19 -0400
commit6cb78ad8bc1af9e14fac0d3255af0f31e885657f (patch)
tree2295321dddeed92c15b59fc4865475237c8d3820
parent4191a7f162fb41f7933fb0a205c5a33d66ad8e21 (diff)
Apex: Removes branch from functest scenario
Branch is messing up functest detection of deploy scenarios. Therefore this patch removes the branch from the scenario before passing it to the test job. Change-Id: I1b59125941e839f1937cba565c73e39efb460573 Signed-off-by: Tim Rozet <trozet@redhat.com>
-rw-r--r--jjb/apex/apex.yaml13
-rw-r--r--jjb/apex/apex.yaml.j213
2 files changed, 26 insertions, 0 deletions
diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index d019fbeeb..2e615b346 100644
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -545,6 +545,19 @@
kill-phase-on: NEVER
abort-all-job: true
git-revision: false
+ - shell: |
+ 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')
+ elif [[ "$features" =~ 'queens' ]]; then
+ functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-(.+)_queens-(noha|ha)/\1-\2-\3/p')
+ else
+ functest_scenario=$DEPLOY_SCENARIO
+ fi
+ echo "DEPLOY_SCENARIO=$functest_scenario" > functest_scenario
+ - inject:
+ properties-file: functest_scenario
+ override-build-parameters: true
- multijob:
name: 'OPNFV Test Suite'
condition: ALWAYS
diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2
index aeefb5d83..e23718e99 100644
--- a/jjb/apex/apex.yaml.j2
+++ b/jjb/apex/apex.yaml.j2
@@ -415,6 +415,19 @@
kill-phase-on: NEVER
abort-all-job: true
git-revision: false
+ - shell: |
+ 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')
+ elif [[ "$features" =~ 'queens' ]]; then
+ functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-(.+)_queens-(noha|ha)/\1-\2-\3/p')
+ else
+ functest_scenario=$DEPLOY_SCENARIO
+ fi
+ echo "DEPLOY_SCENARIO=$functest_scenario" > functest_scenario
+ - inject:
+ properties-file: functest_scenario
+ override-build-parameters: true
- multijob:
name: 'OPNFV Test Suite'
condition: ALWAYS