X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex.yaml;h=c7c938569f5e26ce416b6b0f2dab829e79d4e4db;hb=65092497e5c4e6aa158ea0487b9df9b2a0591e31;hp=7a9106e38e662bec2942f346cc7b8c647dea43cd;hpb=efc5f89524b4e54ba303885398943a93652d3c63;p=releng.git

diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index 7a9106e38..c7c938569 100644
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -576,19 +576,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
@@ -672,7 +661,7 @@
             - name: 'functest-apex-baremetal-daily-{scenario_stream}'
               node-parameters: true
               current-parameters: false
-              predefined-parameters:
+              predefined-parameters: |
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 DOCKER_TAG=$DOCKER_TAG
               kill-phase-on: NEVER
@@ -1098,7 +1087,7 @@
 
     project-type: 'multijob'
 
-    disabled: false
+    disabled: true
 
     node: 'flex-pod2'