X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Fxtesting-pi.yaml;h=a935dcb76d711ee87936b780e9215eea988c3025;hb=9a9f20d715f5a890775748d6b8506369f2ce9fd7;hp=2ed9168885609afbd53ef246abff888a50e1e862;hpb=e8400a7f58e426833f2a9d139f0d0fd39a3e3221;p=releng.git

diff --git a/jjb/functest/xtesting-pi.yaml b/jjb/functest/xtesting-pi.yaml
index 2ed916888..a935dcb76 100644
--- a/jjb/functest/xtesting-pi.yaml
+++ b/jjb/functest/xtesting-pi.yaml
@@ -80,16 +80,22 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          docker pull $image
+          sudo docker pull $image
 
 - builder:
     name: xtesting-pi-run-containers
     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
-          [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/results || true
+          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}
           elif [ "{port}" = "None" ]; then
@@ -97,7 +103,7 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          docker run --rm \
+          sudo docker run --rm \
             --privileged={privileged} \
             --network={network} \
             $volumes \
@@ -125,7 +131,7 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          docker rmi $image || true
+          sudo docker rmi $image || true
 
 - job-template:
     name: 'xtesting-pi-{repo}-{container}-{tag}-pull'
@@ -251,9 +257,15 @@
     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
-          [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/results || true
+          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}
           elif [ "{port}" = "None" ]; then
@@ -261,7 +273,7 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          docker run --rm \
+          sudo docker run --rm \
             $volumes \
             $env \
             -e S3_ENDPOINT_URL=https://storage.googleapis.com \