From: Trevor Bramwell <tbramwell@linuxfoundation.org>
Date: Wed, 18 Aug 2021 21:25:51 +0000 (+0000)
Subject: Merge "Replaces lf-build1/2 references with lf-build5/6"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=bd349865f6f7b988d0b17d4f115eb024078cd6b1;hp=350b5c93f6e3bdd1451218a99a4fc9763033be56;p=releng.git

Merge "Replaces lf-build1/2 references with lf-build5/6"
---

diff --git a/jjb/functest/functest-kubernetes-ng.yaml b/jjb/functest/functest-kubernetes-ng.yaml
index b735e8b64..2c42fc051 100644
--- a/jjb/functest/functest-kubernetes-ng.yaml
+++ b/jjb/functest/functest-kubernetes-ng.yaml
@@ -300,7 +300,8 @@
     name: functest-kubernetes-ng-trivy
     builders:
       - shell: |
-          sudo apt-get update && sudo apt-get install curl -y
+          sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive \
+          apt-get install curl -y
 
           curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sudo sh -s -- -b .
           if [ "{repo}" = "_" ]; then
diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index a874110f0..880395d46 100644
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -97,11 +97,11 @@
           set +x
           volumes=;
           if [ "{volumes}" != "None" ]; then
-            for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
+            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
+            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
@@ -430,11 +430,11 @@
           set +x
           volumes=;
           if [ "{volumes}" != "None" ]; then
-            for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
+            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
+            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
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index c49eaf042..fe33f2201 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -16,7 +16,7 @@
           buildargs:
           branch: master
           slave: lf-virtual1-7
-          dependency: 3.13
+          dependency: 3.14
       - v1.21:
           from:
           buildargs:
@@ -97,11 +97,11 @@
           set +x
           volumes=;
           if [ "{volumes}" != "None" ]; then
-            for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
+            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
+            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
@@ -420,11 +420,11 @@
           set +x
           volumes=;
           if [ "{volumes}" != "None" ]; then
-            for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
+            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
+            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
@@ -737,11 +737,13 @@
     builders:
       - shell: |
           set +x
-          apt-get update && apt-get install \
-            software-properties-common gpg -y
+          apt-get update && DEBIAN_FRONTEND=noninteractive \
+          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 \
+          apt-get update && DEBIAN_FRONTEND=noninteractive \
+          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
@@ -1179,7 +1181,8 @@
     name: functest-kubernetes-trivy
     builders:
       - shell: |
-          apt-get update && apt-get install curl -y
+          apt-get update && DEBIAN_FRONTEND=noninteractive \
+          apt-get install curl -y
 
           curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b .
           if [ "{repo}" = "_" ]; then
diff --git a/jjb/functest/functest-pi.yaml b/jjb/functest/functest-pi.yaml
index 8c7092303..52dc042e4 100644
--- a/jjb/functest/functest-pi.yaml
+++ b/jjb/functest/functest-pi.yaml
@@ -126,11 +126,11 @@
           set +x
           volumes=;
           if [ "{volumes}" != "None" ]; then
-            for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
+            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
+            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
@@ -689,11 +689,11 @@
           set +x
           volumes=;
           if [ "{volumes}" != "None" ]; then
-            for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
+            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
+            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
diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 0a4dc2aae..31a448cde 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -17,7 +17,7 @@
           branch: master
           slave: lf-pod4-2
           DASHBOARD_URL: http://172.30.12.85
-          dependency: 3.13
+          dependency: 3.14
       - wallaby:
           from:
           buildargs:
@@ -116,11 +116,11 @@
           set +x
           volumes=;
           if [ "{volumes}" != "None" ]; then
-            for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
+            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
+            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
@@ -579,11 +579,11 @@
           set +x
           volumes=;
           if [ "{volumes}" != "None" ]; then
-            for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
+            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
+            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
@@ -958,11 +958,13 @@
     builders:
       - shell: |
           set +x
-          sudo apt-get update && sudo apt-get install \
-            software-properties-common gpg -y
+          sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive \
+          apt-get install software-properties-common gpg -y
           sudo add-apt-repository -y ppa:deadsnakes/ppa
-          sudo apt-get update && sudo apt-get install python3.8 \
-            python3.8-dev python3.8-distutils \
+          sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive \
+          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
           sudo pip3 install tox tox-pip-version
@@ -1512,7 +1514,8 @@
     name: functest-trivy
     builders:
       - shell: |
-          sudo apt-get update && sudo apt-get install curl -y
+          sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive \
+          apt-get install curl -y
 
           curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sudo sh -s -- -b .
           if [ "{repo}" = "_" ]; then
diff --git a/jjb/functest/xtesting-pi.yaml b/jjb/functest/xtesting-pi.yaml
index a8d55c059..a935dcb76 100644
--- a/jjb/functest/xtesting-pi.yaml
+++ b/jjb/functest/xtesting-pi.yaml
@@ -89,11 +89,11 @@
           set +x
           volumes=;
           if [ "{volumes}" != "None" ]; then
-            for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
+            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
+            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
@@ -259,11 +259,11 @@
           set +x
           volumes=;
           if [ "{volumes}" != "None" ]; then
-            for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
+            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
+            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
diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index 1d08d7c56..ec613a682 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:
@@ -89,11 +89,11 @@
           set +x
           volumes=;
           if [ "{volumes}" != "None" ]; then
-            for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
+            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
+            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
@@ -247,11 +247,11 @@
           set +x
           volumes=;
           if [ "{volumes}" != "None" ]; then
-            for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
+            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
+            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
@@ -489,11 +489,13 @@
     builders:
       - shell: |
           set +x
-          sudo apt-get update && sudo apt-get install \
-            software-properties-common gpg -y
+          sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive \
+          apt-get install software-properties-common gpg -y
           sudo add-apt-repository -y ppa:deadsnakes/ppa
-          sudo apt-get update && sudo apt-get install python3.8 \
-            python3.8-dev python3.8-distutils \
+          sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive \
+          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
           sudo pip3 install tox tox-pip-version
@@ -769,7 +771,8 @@
     name: xtesting-trivy
     builders:
       - shell: |
-          sudo apt-get update && sudo apt-get install curl -y
+          sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive \
+          apt-get install curl -y
 
           curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sudo sh -s -- -b .
           if [ "{repo}" = "_" ]; then