Merge "[CORD-3039]v2 Fixes to imagebuilder job"
diff --git a/jjb/imagebuilder.yaml b/jjb/imagebuilder.yaml
index e29b11c..968a702 100644
--- a/jjb/imagebuilder.yaml
+++ b/jjb/imagebuilder.yaml
@@ -38,7 +38,7 @@
parameters:
- string:
name: executorNode
- default: 'imagebuilder_node'
+ default: 'imagebuilder'
description: 'Name of the Jenkins node to run the job on'
- string:
@@ -51,11 +51,6 @@
default: '$GERRIT_BRANCH'
description: 'Name of the repo branch to use'
- - string:
- name: gerritProject
- default: '$GERRIT_PROJECT'
- description: 'Name of the Gerrit project'
-
- bool:
name: build
default: false
diff --git a/jjb/pipeline/imagebuilder.groovy b/jjb/pipeline/imagebuilder.groovy
index b86bc22..deee937 100644
--- a/jjb/pipeline/imagebuilder.groovy
+++ b/jjb/pipeline/imagebuilder.groovy
@@ -27,17 +27,17 @@
stage('imagebuilder'){
steps {
- sh '''
+ sh """
#!/usr/bin/env bash
- mkdir "$WORKSPACE/image_logs"
+ mkdir "$WORKSPACE/ib_logs"
ib_args=""
- if [[ ${params.force} == 'true' ]]; then
+ if [ "${params.force}" = "true" ]; then
ib_args+="--force "
fi
- if [[ ${params.build} == 'true' ]]; then
+ if [ "${params.build}" = "true" ]; then
ib_args+="--build "
fi
@@ -47,7 +47,7 @@
-l "$WORKSPACE/ib_logs" \
-g "$WORKSPACE/ib_graph.dot"
popd
- '''
+ """
}
}