summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2017-02-10 15:31:43 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-02-10 15:31:43 +0000
commita7d6727b96e3244b55106481275686f59487036b (patch)
tree20052942bd06c9bb3e9e12907aef81b3cb88353c /jjb
parentb34c8ba964854d9a739c880d91d3ae24789f57fe (diff)
parent7a8cbac15425eb8cf42cc5f5574f65b200dba293 (diff)
Merge "Revert include-raw-escape to include-raw"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/daisy4nfv/daisy4nfv-merge-jobs.yml14
1 files changed, 7 insertions, 7 deletions
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