Protect if {volumes} or env is None (zip part)

Change-Id: Id17fc3b4c5420174f48984ffe8c48054f8e6a30e
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

1 files changed, 8 insertions, 2 deletions

diff --git a/jjb/functest/functest-pi.yaml b/jjb/functest/functest-pi.yaml
index a4d4b52b5..8c7092303 100644
--- a/jjb/functest/functest-pi.yaml
+++ b/jjb/functest/functest-pi.yaml
@@ -687,8 +687,14 @@
     builders:
       - shell: |
           set +x
-          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
+          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" ] && sudo rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}