Fix param serialization in apex jjbs

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

diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index 564417c..454c690 100644 (file)
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -586,6 +586,7 @@
             echo "DOCKER_TAG=hunter" > functest_scenario
           else
             functest_scenario=$DEPLOY_SCENARIO
+            echo "DOCKER_TAG=''" > functest_scenario
           fi
           echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_scenario
       - inject:
@@ -641,6 +642,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
@@ -667,8 +672,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
@@ -874,7 +880,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
@@ -2021,12 +2027,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'
@@ -2046,7 +2052,7 @@
 - trigger:
     name: 'gambia-queens'
     triggers:
-      - timed: '0 12 * * *'
+      - timed: '0 5 * * *'
 
 - trigger:
     name: 'fraser-master'