X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdaisy4nfv%2Fdaisy-daily-jobs.yml;h=a9a0da2ee5448339d935322f75856ccd75371c01;hb=bb2508b0f971de18385fc65b82c5ae0e32c83915;hp=5a0e321f01597d36c027f8a9bf2cb34b401adf23;hpb=36b4348e88e2dc2f8a53fa3b9d053aa0bd25abb9;p=releng.git

diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml
index 5a0e321f0..a9a0da2ee 100644
--- a/jjb/daisy4nfv/daisy-daily-jobs.yml
+++ b/jjb/daisy4nfv/daisy-daily-jobs.yml
@@ -32,24 +32,24 @@
     #        CI PODs
     # -------------------------------
     pod:
-      # - baremetal:
-      #     slave-label: daisy-baremetal
-      #     <<: *master
-      - virtual:
-          slave-label: daisy-virtual
-          <<: *master
       - baremetal:
           slave-label: daisy-baremetal
-          <<: *euphrates
+          <<: *master
       - virtual:
           slave-label: daisy-virtual
-          <<: *euphrates
+          <<: *master
+      # - baremetal:
+      #     slave-label: daisy-baremetal
+      #     <<: *euphrates
+      # - virtual:
+      #     slave-label: daisy-virtual
+      #     <<: *euphrates
       # -------------------------------
       #        None-CI PODs
       # -------------------------------
-      - baremetal:
-          slave-label: zte-pod3
-          <<: *master
+      # - baremetal:
+      #     slave-label: zte-pod3
+      #     <<: *master
       - zte-pod9:
           slave-label: zte-pod9
           <<: *master
@@ -117,9 +117,7 @@
       - '{installer}-defaults'
       - '{slave-label}-defaults':
           installer: '{installer}'
-      - string:
-          name: DEPLOY_SCENARIO
-          default: '{scenario}'
+      - 'testapi-parameter'
       - 'daisy-project-parameter':
           gs-pathname: '{gs-pathname}'
 
@@ -129,7 +127,7 @@
       - trigger-builds:
           - project: 'daisy-deploy-{pod}-daily-{stream}'
             current-parameters: false
-            predefined-parameters:
+            predefined-parameters: |
               DEPLOY_SCENARIO={scenario}
               INSTALLER_VERSION={stream}
               UPSTREAM_JOB_NAME=$JOB_NAME
@@ -139,7 +137,7 @@
       - trigger-builds:
           - project: 'functest-daisy-{pod}-daily-{stream}'
             current-parameters: false
-            predefined-parameters:
+            predefined-parameters: |
               DEPLOY_SCENARIO={scenario}
               INSTALLER_VERSION={stream}
               UPSTREAM_JOB_NAME=$JOB_NAME
@@ -163,7 +161,7 @@
             - trigger-builds:
                 - project: 'yardstick-daisy-{pod}-daily-{stream}'
                   current-parameters: false
-                  predefined-parameters:
+                  predefined-parameters: |
                     DEPLOY_SCENARIO={scenario}
                     INSTALLER_VERSION={stream}
                     UPSTREAM_JOB_NAME=$JOB_NAME
@@ -203,9 +201,7 @@
       - '{installer}-defaults'
       - '{slave-label}-defaults':
           installer: '{installer}'
-      - string:
-          name: DEPLOY_SCENARIO
-          default: 'os-nosdn-nofeature-ha'
+      - 'testapi-parameter'
       - 'daisy-project-parameter':
           gs-pathname: '{gs-pathname}'
       - string: