From 0c7a6ba0036a26a0d6beb5cc402df050c13ebb69 Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Thu, 7 Sep 2017 01:43:20 +0200
Subject: 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>
---
 jjb/armband/armband-verify-jobs.yml | 2 +-
 jjb/fuel/fuel-verify-jobs.yml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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'
-- 
cgit 1.2.3-korg

le/danube'>stable/danube</option>
<option value='stable/euphrates'>stable/euphrates</option>
<option value='stable/fraser'>stable/fraser</option>
<option value='stable/gambia'>stable/gambia</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'></td><td class='sub right'>Grokmirror user</td></tr></table>
<table class='tabs'><tr><td>
<a href='/compass4nfv/?h=opnfv-6.2.0'>summary</a><a href='/compass4nfv/refs/?h=opnfv-6.2.0&amp;id=72039e915d1fc960bd0d7fccd910ea282d61bee7'>refs</a><a href='/compass4nfv/log/deploy/adapters/ansible/roles/keystone/tasks/main.yml?h=opnfv-6.2.0'>log</a><a class='active' href='/compass4nfv/tree/deploy/adapters/ansible/roles/keystone/tasks/main.yml?h=opnfv-6.2.0&amp;id=72039e915d1fc960bd0d7fccd910ea282d61bee7'>tree</a><a href='/compass4nfv/commit/deploy/adapters/ansible/roles/keystone/tasks/main.yml?h=opnfv-6.2.0&amp;id=72039e915d1fc960bd0d7fccd910ea282d61bee7'>commit</a><a href='/compass4nfv/diff/deploy/adapters/ansible/roles/keystone/tasks/main.yml?h=opnfv-6.2.0&amp;id=72039e915d1fc960bd0d7fccd910ea282d61bee7'>diff</a><a href='/compass4nfv/stats/deploy/adapters/ansible/roles/keystone/tasks/main.yml?h=opnfv-6.2.0'>stats</a></td><td class='form'><form class='right' method='get' action='/compass4nfv/log/deploy/adapters/ansible/roles/keystone/tasks/main.yml'>
<input type='hidden' name='h' value='opnfv-6.2.0'/><input type='hidden' name='id' value='72039e915d1fc960bd0d7fccd910ea282d61bee7'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/compass4nfv/tree/?h=opnfv-6.2.0&amp;id=72039e915d1fc960bd0d7fccd910ea282d61bee7'>root</a>/<a href='/compass4nfv/tree/deploy?h=opnfv-6.2.0&amp;id=72039e915d1fc960bd0d7fccd910ea282d61bee7'>deploy</a>/<a href='/compass4nfv/tree/deploy/adapters?h=opnfv-6.2.0&amp;id=72039e915d1fc960bd0d7fccd910ea282d61bee7'>adapters</a>/<a href='/compass4nfv/tree/deploy/adapters/ansible?h=opnfv-6.2.0&amp;id=72039e915d1fc960bd0d7fccd910ea282d61bee7'>ansible</a>/<a href='/compass4nfv/tree/deploy/adapters/ansible/roles?h=opnfv-6.2.0&amp;id=72039e915d1fc960bd0d7fccd910ea282d61bee7'>roles</a>/<a href='/compass4nfv/tree/deploy/adapters/ansible/roles/keystone?h=opnfv-6.2.0&amp;id=72039e915d1fc960bd0d7fccd910ea282d61bee7'>keystone</a>/<a href='/compass4nfv/tree/deploy/adapters/ansible/roles/keystone/tasks?h=opnfv-6.2.0&amp;id=72039e915d1fc960bd0d7fccd910ea282d61bee7'>tasks</a>/<a href='/compass4nfv/tree/deploy/adapters/ansible/roles/keystone/tasks/main.yml?h=opnfv-6.2.0&amp;id=72039e915d1fc960bd0d7fccd910ea282d61bee7'>main.yml</a></div><div class='content'>blob: 3ff37342025b4afc943a119279db3c4096029bea (<a href='/compass4nfv/plain/deploy/adapters/ansible/roles/keystone/tasks/main.yml?h=opnfv-6.2.0&amp;id=72039e915d1fc960bd0d7fccd910ea282d61bee7'>plain</a>)
<table summary='blob content' class='blob'>
<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
<a id='n2' href='#n2'>2</a>
<a id='n3' href='#n3'>3</a>
<a id='n4' href='#n4'>4</a>
<a id='n5' href='#n5'>5</a>
<a id='n6' href='#n6'>6</a>
<a id='n7' href='#n7'>7</a>
<a id='n8' href='#n8'>8</a>
<a id='n9' href='#n9'>9</a>
<a id='n10' href='#n10'>10</a>
<a id='n11' href='#n11'>11</a>
<a id='n12' href='#n12'>12</a>
</pre></td>
<td class='lines'><pre><code>