From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Wed, 6 Sep 2017 23:43:20 +0000 (+0200)
Subject: fuel, armband: Use include-raw in macros
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=0c7a6ba0036a26a0d6beb5cc402df050c13ebb69;p=releng.git

fuel, armband: Use include-raw in macros

Using include-raw-escape inside macros adds extra curly braces, which
breaks bash scripts.

JIRA: FUEL-287

Change-Id: If1e5f528e76aff78d2c9b99530b72070b6731f75
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---

diff --git a/jjb/armband/armband-verify-jobs.yml b/jjb/armband/armband-verify-jobs.yml
index b18d9f71e..c43dc7f82 100644
--- a/jjb/armband/armband-verify-jobs.yml
+++ b/jjb/armband/armband-verify-jobs.yml
@@ -208,7 +208,7 @@
     name: 'armband-verify-deploy-virtual-macro'
     builders:
         - shell:
-            !include-raw-escape: ../fuel/fuel-deploy.sh
+            !include-raw: ../fuel/fuel-deploy.sh
 
 - builder:
     name: 'armband-verify-smoke-test-macro'
diff --git a/jjb/fuel/fuel-verify-jobs.yml b/jjb/fuel/fuel-verify-jobs.yml
index f5840bcab..45197fc4e 100644
--- a/jjb/fuel/fuel-verify-jobs.yml
+++ b/jjb/fuel/fuel-verify-jobs.yml
@@ -208,7 +208,7 @@
     name: 'fuel-verify-deploy-virtual-macro'
     builders:
         - shell:
-            !include-raw-escape: ./fuel-deploy.sh
+            !include-raw: ./fuel-deploy.sh
 
 - builder:
     name: 'fuel-verify-smoke-test-macro'