[Apex] Move Functest Scenario selection to script

[releng.git] / jjb / apex / apex.yaml.j2

diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2
index ec73553..3517152 100644 (file)
--- a/jjb/apex/apex.yaml.j2
+++ b/jjb/apex/apex.yaml.j2
@@ -422,18 +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
-          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
@@ -487,6 +477,10 @@
           name: DEPLOY_SCENARIO
           default: '{scenario}'
           description: "Scenario to deploy with."
+      - string:
+          name: DOCKER_TAG
+          default: ''
+          description: Default docker tag to pass to functest
 
     properties:
       - logrotate-default
@@ -513,8 +507,9 @@
             - 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
               abort-all-job: false
               git-revision: false
@@ -720,7 +715,7 @@
           description: "Used for overriding the PROMOTE"
       - string:
           name: GS_URL
-          default: 'gs://artifacts.opnfv.org/apex/{os_version}/{topology}'
+          default: 'artifacts.opnfv.org/apex/{os_version}/{topology}'
           description: "User for overriding GS_URL from apex params"
       - string:
           name: OS_VERSION
@@ -1203,12 +1198,12 @@
 - trigger:
     name: 'master-master'
     triggers:
-      - timed: '0 12 * * *'
+      - timed: '0 5 * * *'
 
 - trigger:
     name: 'master-rocky'
     triggers:
-      - timed: '0 12 * * *'
+      - timed: '0 5 * * *'
 
 - trigger:
     name: 'master-queens'
@@ -1228,7 +1223,7 @@
 - trigger:
     name: 'gambia-queens'
     triggers:
-      - timed: '0 12 * * *'
+      - timed: '0 5 * * *'
 
 - trigger:
     name: 'fraser-master'