summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien <zhang.jun3g@zte.com.cn>2017-02-10 23:56:49 +0800
committerJulien <zhang.jun3g@zte.com.cn>2017-02-10 23:56:49 +0800
commit70326c7ccbc4b47e4ab54c0f64f4a839bea32554 (patch)
tree5db30a8e52bf8a78569abcdc6bc5c97f8c67870b
parente93b8ee0448786f9621d8bb7f58b34c0718c7294 (diff)
Fix escape errors
{ becomes {{ and } becomes }} replace include-raw-escape with include-raw verified by 28425 Change-Id: I252c3e4a901410aba7c7d14202cd52b7bd3becba Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
-rw-r--r--jjb/daisy4nfv/daisy-project-jobs.yml12
-rw-r--r--jjb/daisy4nfv/daisy4nfv-verify-jobs.yml6
2 files changed, 9 insertions, 9 deletions
diff --git a/jjb/daisy4nfv/daisy-project-jobs.yml b/jjb/daisy4nfv/daisy-project-jobs.yml
index f712adb0a..156740980 100644
--- a/jjb/daisy4nfv/daisy-project-jobs.yml
+++ b/jjb/daisy4nfv/daisy-project-jobs.yml
@@ -182,21 +182,21 @@
name: 'daisy-build-daily-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-deploy-daily-macro'
builders:
- shell:
- !include-raw-escape: ./daisy4nfv-download-artifact.sh
+ !include-raw: ./daisy4nfv-download-artifact.sh
- shell:
- !include-raw-escape: ./daisy4nfv-deploy.sh
+ !include-raw: ./daisy4nfv-deploy.sh
- builder:
name: 'daisy-test-daily-macro'
diff --git a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
index febce6f82..ee82c14b2 100644
--- a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
+++ b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
@@ -169,11 +169,11 @@
name: 'daisy-verify-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-workspace-cleanup.sh
+ !include-raw: ./daisy4nfv-workspace-cleanup.sh
#####################################
# parameter macros