X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Fxtesting.yaml;h=a836711cd33454ddb94fe4f98c242764abfc8ada;hb=refs%2Fchanges%2F16%2F72816%2F1;hp=4ad16d0d9a2bcf060e1326de4de60f83720b166a;hpb=e8400a7f58e426833f2a9d139f0d0fd39a3e3221;p=releng.git

diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index 4ad16d0d9..a836711cd 100644
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -16,7 +16,7 @@
           buildargs:
           branch: master
           slave: lf-virtual1
-          dependency: 3.13
+          dependency: 3.14
       - wallaby:
           from:
           buildargs:
@@ -80,16 +80,22 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          docker pull $image
+          sudo docker pull $image
 
 - builder:
     name: xtesting-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-{repo}-{container}-{tag}-pull'
@@ -239,9 +245,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
@@ -249,7 +261,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 \
@@ -394,7 +406,7 @@
           if [ "{from}" != "None" ]; then
               sed -i {from} Dockerfile
           fi
-          docker build $build_args \
+          sudo docker build $build_args \
             --pull=false --no-cache --force-rm=true \
             -t $image .
 
@@ -426,7 +438,7 @@
           else
             image=_:/alpine:{dependency}
           fi
-          docker pull $image || true
+          sudo docker pull $image || true
 
 - builder:
     name: xtesting-remove-dep-images
@@ -440,7 +452,7 @@
           else
             image=_:/alpine:{dependency}
           fi
-          docker rmi $image || true
+          sudo docker rmi $image || true
 
 - job-template:
     name: 'xtesting-{repo}-{tag}-dep-pull'
@@ -477,14 +489,15 @@
     builders:
       - shell: |
           set +x
-          apt-get update && apt-get install \
+          sudo apt-get update && sudo apt-get install \
             software-properties-common gpg -y
-          add-apt-repository -y ppa:deadsnakes/ppa
-          apt-get update && apt-get install python3.8 \
-            python3.8-dev python3.8-distutils \
+          sudo add-apt-repository -y ppa:deadsnakes/ppa
+          sudo apt-get update && sudo apt-get install \
+            python3.9 python3.9-dev python3.9-distutils \
+            python3.8 python3.8-dev python3.8-distutils \
             python3.7 python3.7-dev python3.6 python3.6-dev \
             python python-dev python3-pip enchant -y
-          pip3 install tox tox-pip-version
+          sudo pip3 install tox tox-pip-version
 
           tox
 
@@ -669,7 +682,7 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          docker push $image
+          sudo docker push $image
 
 - trigger:
     name: xtesting-commit
@@ -757,9 +770,9 @@
     name: xtesting-trivy
     builders:
       - shell: |
-          apt-get update && apt-get install curl -y
+          sudo apt-get update && sudo apt-get install curl -y
 
-          curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b .
+          curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sudo sh -s -- -b .
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then