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 b18d9f7..c43dc7f 100644 (file)
--- 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 f5840bc..45197fc 100644 (file)
--- 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'