From: Zhijiang Hu <hu.zhijiang@zte.com.cn>
Date: Wed, 17 Jan 2018 03:01:40 +0000 (-0500)
Subject: [daisy] Add '|' for more than one predefined-parameters
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=98001aa4f1fbe033d80b812aa74c760de4f2c187;p=releng.git

[daisy] Add '|' for more than one predefined-parameters

This tries to solve Job name error [1] which cause functest
failure.

[1] https://build.opnfv.org/ci/job/functest-daisy-baremetal-daily-master/257/console

Change-Id: I89c9a00bcaf0ccb274a18339533bdd99b1134be3
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
---

diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml
index 5a0e321f0..6f4643ac8 100644
--- a/jjb/daisy4nfv/daisy-daily-jobs.yml
+++ b/jjb/daisy4nfv/daisy-daily-jobs.yml
@@ -129,7 +129,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 +139,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 +163,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