X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex.yaml.j2;h=8edcc2742c469fd4b33d1967f020bf64f2575218;hb=e5f84a3136f7c44e02e12149cb54a747a5e244b8;hp=daf2ce8b7753e0e677a542c322b4f6c9c3731e46;hpb=4671a311e897fea4d4805598f2599e8a1c7a598a;p=releng.git

diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2
index daf2ce8b7..8edcc2742 100644
--- a/jjb/apex/apex.yaml.j2
+++ b/jjb/apex/apex.yaml.j2
@@ -422,19 +422,8 @@
               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" == 'rocky' ]; then
-            functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-rocky-(noha|ha)/\1-nofeature-\2/p')
-            echo "DOCKER_TAG=hunter" > functest_scenario
-          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
-            echo "DOCKER_TAG=''" > functest_scenario
-          fi
-          echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_scenario
+      - shell:
+          !include-raw-escape: ./apex-functest-scenario.sh
       - inject:
           properties-file: functest_scenario
           override-build-parameters: true
@@ -944,7 +933,7 @@
 
     project-type: 'multijob'
 
-    disabled: false
+    disabled: true
 
     node: 'flex-pod2'