summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/apex/apex-functest-scenario.sh2
-rw-r--r--jjb/apex/apex-verify-jobs.yaml11
2 files changed, 3 insertions, 10 deletions
diff --git a/jjb/apex/apex-functest-scenario.sh b/jjb/apex/apex-functest-scenario.sh
index dcbed4479..f1cb74e24 100644
--- a/jjb/apex/apex-functest-scenario.sh
+++ b/jjb/apex/apex-functest-scenario.sh
@@ -11,7 +11,7 @@ elif [[ "$features" =~ 'rocky' ]]; then
functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-(.+)_rocky-(noha|ha)/\1-\2-\3/p')
echo "DOCKER_TAG=hunter" > functest_scenario
else
- functest_scenario=$DEPLOY_SCENARIO
+ functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/-(noha|ha).*/-\1/p')
echo "DOCKER_TAG=$([[ ${BRANCH##*/} == "master" ]] && \
echo "latest" || echo ${BRANCH##*/})" > functest_scenario
fi
diff --git a/jjb/apex/apex-verify-jobs.yaml b/jjb/apex/apex-verify-jobs.yaml
index c10a7836e..a61d9fdab 100644
--- a/jjb/apex/apex-verify-jobs.yaml
+++ b/jjb/apex/apex-verify-jobs.yaml
@@ -355,15 +355,8 @@
kill-phase-on: FAILURE
abort-all-job: true
git-revision: true
- - shell: |
- features=$(echo $DEPLOY_SCENARIO | sed -r -n 's/os-.+-(.+)-(noha|ha)/\1/p')
- if [ "$features" == 'rocky' ]; then
- echo "DOCKER_TAG=hunter" > functest_tag
- elif [[ "$features" =~ 'rocky' ]]; then
- echo "DOCKER_TAG=hunter" > functest_tag
- else
- echo "DOCKER_TAG=''" > functest_tag
- fi
+ - shell:
+ !include-raw-escape: ./apex-functest-scenario.sh
- inject:
properties-file: functest_tag
override-build-parameters: true