Apex: Fix functest docker tag passing for gate

The daily job moved to using the apex-functest-scenario script. This
updates the gate jobs to use the same logic as well as updates the
detection script to drop snapshot specific extensions like functest/csit
which Apex uses to determine special deploy types.

Change-Id: Id5f23d71401fc341c640b388f583b304b2ac6789
Signed-off-by: Tim Rozet <trozet@redhat.com>

diff --git a/jjb/apex/apex-functest-scenario.sh b/jjb/apex/apex-functest-scenario.sh
index dcbed44..f1cb74e 100644 (file)
--- 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 c10a783..a61d9fd 100644 (file)
--- 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