summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-01-08 16:54:42 +0100
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-01-08 16:56:09 +0100
commit93f47fe21863fe4d7a99c1c492ad4693aa6dc5c3 (patch)
tree6911c4d3c454160de1e61f5992ad51e7151ba20d /jjb
parenta8f12bed43703261d23bcd11d650ceffcf4fe5c3 (diff)
fuel: Switch to include-raw-escape for jjbs and adjust scripts accordingly
Change-Id: Ic1a0b6e14223476b9a2bded877e787237dbc7d8f Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'jjb')
-rwxr-xr-xjjb/fuel/fuel-build.sh2
-rw-r--r--jjb/fuel/fuel-ci-jobs.yml4
-rwxr-xr-xjjb/fuel/fuel-deploy-virtual.sh2
-rw-r--r--jjb/fuel/fuel-project-jobs.yml22
4 files changed, 15 insertions, 15 deletions
diff --git a/jjb/fuel/fuel-build.sh b/jjb/fuel/fuel-build.sh
index d6a71e00b..d51637afd 100755
--- a/jjb/fuel/fuel-build.sh
+++ b/jjb/fuel/fuel-build.sh
@@ -56,7 +56,7 @@ if [[ "$JOB_NAME" =~ "verify" && "$GERRIT_CHANGE_COMMIT_MESSAGE" =~ "$NOCACHE_PA
echo "The cache will not be used for this build!"
NOCACHE_ARG="-f P"
fi
-NOCACHE_ARG=${{NOCACHE_ARG:-}}
+NOCACHE_ARG=${NOCACHE_ARG:-}
# start the build
cd $WORKSPACE/ci
diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml
index 1b4b26963..273d9a4c9 100644
--- a/jjb/fuel/fuel-ci-jobs.yml
+++ b/jjb/fuel/fuel-ci-jobs.yml
@@ -150,9 +150,9 @@
builders:
- shell:
- !include-raw ./fuel-download-artifact.sh
+ !include-raw-escape: ./fuel-download-artifact.sh
- shell:
- !include-raw ./fuel-deploy.sh
+ !include-raw-escape: ./fuel-deploy.sh
publishers:
- email:
diff --git a/jjb/fuel/fuel-deploy-virtual.sh b/jjb/fuel/fuel-deploy-virtual.sh
index 8e9282373..e7c83b77f 100755
--- a/jjb/fuel/fuel-deploy-virtual.sh
+++ b/jjb/fuel/fuel-deploy-virtual.sh
@@ -24,7 +24,7 @@ chmod a+x $TMPDIR
# get the lab name from SLAVE_NAME
# we currently support ericsson and intel labs
-LAB_NAME=${{NODE_NAME%%-*}}
+LAB_NAME=${NODE_NAME%%-*}
if [[ ! "$LAB_NAME" =~ (ericsson|intel) ]]; then
echo "Unsupported/unidentified lab $LAB_NAME. Cannot continue!"
exit 1
diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml
index 848fd0b21..a04e4e65d 100644
--- a/jjb/fuel/fuel-project-jobs.yml
+++ b/jjb/fuel/fuel-project-jobs.yml
@@ -60,11 +60,11 @@
builders:
- shell:
- !include-raw ./fuel-build.sh
+ !include-raw-escape: ./fuel-build.sh
- shell:
- !include-raw ./fuel-upload-artifact.sh
+ !include-raw-escape: ./fuel-upload-artifact.sh
- shell:
- !include-raw ./fuel-workspace-cleanup.sh
+ !include-raw-escape: ./fuel-workspace-cleanup.sh
publishers:
- email:
@@ -125,9 +125,9 @@
builders:
- shell:
- !include-raw ./fuel-build.sh
+ !include-raw-escape: ./fuel-build.sh
- shell:
- !include-raw ./fuel-workspace-cleanup.sh
+ !include-raw-escape: ./fuel-workspace-cleanup.sh
- job-template:
name: 'fuel-merge-build-{stream}'
@@ -176,11 +176,11 @@
builders:
- shell:
- !include-raw ./fuel-build.sh
+ !include-raw-escape: ./fuel-build.sh
- shell:
- !include-raw ./fuel-upload-artifact.sh
+ !include-raw-escape: ./fuel-upload-artifact.sh
- shell:
- !include-raw ./fuel-workspace-cleanup.sh
+ !include-raw-escape: ./fuel-workspace-cleanup.sh
- job-template:
name: 'fuel-merge-deploy-virtual-{stream}'
@@ -228,11 +228,11 @@
builders:
- shell:
- !include-raw ./fuel-download-artifact.sh
+ !include-raw-escape: ./fuel-download-artifact.sh
- shell:
- !include-raw ./fuel-deploy-virtual.sh
+ !include-raw-escape: ./fuel-deploy-virtual.sh
- shell:
- !include-raw ./fuel-workspace-cleanup.sh
+ !include-raw-escape: ./fuel-workspace-cleanup.sh
publishers:
- email: