summaryrefslogtreecommitdiffstats
path: root/jjb/functest/functest.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/functest/functest.yaml')
-rw-r--r--jjb/functest/functest.yaml15
1 files changed, 10 insertions, 5 deletions
diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 31a448cde..7a0be506a 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -116,11 +116,13 @@
set +x
volumes=;
if [ "{volumes}" != "None" ]; then
- for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); do volumes="-v $i $volumes"; done
+ for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); \
+ do volumes="-v $i $volumes"; done
fi
env=;
if [ "{env}" != "None" ]; then
- for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); do env="-e $i $env"; done
+ for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); \
+ do env="-e $i $env"; done
fi
[ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
if [ "{repo}" = "_" ]; then
@@ -579,11 +581,13 @@
set +x
volumes=;
if [ "{volumes}" != "None" ]; then
- for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); do volumes="-v $i $volumes"; done
+ for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); \
+ do volumes="-v $i $volumes"; done
fi
env=;
if [ "{env}" != "None" ]; then
- for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); do env="-e $i $env"; done
+ for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); \
+ do env="-e $i $env"; done
fi
[ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
if [ "{repo}" = "_" ]; then
@@ -866,7 +870,8 @@
fi
build_args=""
if [ "{buildargs}" != "None" ]; then
- build_args="{buildargs}"
+ for i in $(eval echo {buildargs} | tr -d '[]' |sed "s/, / /g" ); \
+ do build_args="--build-arg $i $build_args"; done
fi
if [ "{ref_arg}" != "None" ]; then
build_args="$build_args --build-arg {ref_arg}={ref}"