summaryrefslogtreecommitdiffstats
path: root/jjb/functest/xtesting.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/functest/xtesting.yaml')
-rw-r--r--jjb/functest/xtesting.yaml12
1 files changed, 9 insertions, 3 deletions
diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index 573e02ca5..ab770cd7b 100644
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -86,9 +86,15 @@
name: xtesting-run-containers
builders:
- shell: |
- set -ex
- volumes=; for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
- env=; for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done
+ set +x
+ volumes=;
+ if [ "{volumes}" != "None" ]; then
+ 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
+ fi
[ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/results || true
if [ "{repo}" = "_" ]; then
image={container}:{tag}