From: Zhijiang Hu <hu.zhijiang@zte.com.cn>
Date: Fri, 10 Feb 2017 13:19:45 +0000 (-0500)
Subject: Revert include-raw-escape to include-raw
X-Git-Tag: danube.1.0~308^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F25%2F28425%2F1;p=releng.git

Revert include-raw-escape to include-raw

Otherwise, we saw functions definition in shell script to be
fold by double bracket, not single as expected.

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

diff --git a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
index 11cdc1bf3..a6659b2bf 100644
--- a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
+++ b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
@@ -179,23 +179,23 @@
     name: 'daisy-merge-build-macro'
     builders:
         - shell:
-            !include-raw-escape: ./daisy4nfv-basic.sh
+            !include-raw: ./daisy4nfv-basic.sh
         - shell:
-            !include-raw-escape: ./daisy4nfv-build.sh
+            !include-raw: ./daisy4nfv-build.sh
         - shell:
-            !include-raw-escape: ./daisy4nfv-upload-artifact.sh
+            !include-raw: ./daisy4nfv-upload-artifact.sh
         - shell:
-            !include-raw-escape: ./daisy4nfv-workspace-cleanup.sh
+            !include-raw: ./daisy4nfv-workspace-cleanup.sh
 
 - builder:
     name: 'daisy-merge-deploy-virtual-macro'
     builders:
         - shell:
-            !include-raw-escape: ./daisy4nfv-download-artifact.sh
+            !include-raw: ./daisy4nfv-download-artifact.sh
         - shell:
-            !include-raw-escape: ./daisy4nfv-virtual-deploy.sh
+            !include-raw: ./daisy4nfv-virtual-deploy.sh
         - shell:
-            !include-raw-escape: ./daisy4nfv-workspace-cleanup.sh
+            !include-raw: ./daisy4nfv-workspace-cleanup.sh
 
 #####################################
 # parameter macros