diff options
author | 2021-07-01 09:30:45 +0200 | |
---|---|---|
committer | 2021-07-01 10:33:35 +0200 | |
commit | b7bf83ddffbb3c7228ab9a6baf7f6b3b6ff714f3 (patch) | |
tree | cc6b3792bbacb8503332f8e7012064fbfd7f5be3 /jjb/functest/xtesting.yaml | |
parent | 00cf0af21949ddcff4811702848f0cce5d492cff (diff) |
Protect if {volumes} or env is None
Change-Id: Ieedf854c0a8e3a993f22e4e6e8fc7d9e5973771c
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'jjb/functest/xtesting.yaml')
-rw-r--r-- | jjb/functest/xtesting.yaml | 12 |
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} |