From: Trevor Bramwell <tbramwell@linuxfoundation.org>
Date: Mon, 1 Mar 2021 19:13:28 +0000 (+0000)
Subject: Merge "Adding file to build rapid vm qcow2 image"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f4c43a00986c4fdc1cfdcc3e1d3cdaae9e4aec51;hp=4a0b52a22f544467ec50ca429efcf3dc3ea16fb3;p=releng.git

Merge "Adding file to build rapid vm qcow2 image"
---

diff --git a/jjb/functest/functest-kubernetes-ng.yaml b/jjb/functest/functest-kubernetes-ng.yaml
index c447d5398..5737fa79f 100644
--- a/jjb/functest/functest-kubernetes-ng.yaml
+++ b/jjb/functest/functest-kubernetes-ng.yaml
@@ -332,6 +332,7 @@
     builders:
       - shell: |
           sudo apt-get update && sudo apt-get install curl -y
+
           curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sudo sh -s -- -b .
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index 803e74eff..190e830d3 100644
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -262,12 +262,6 @@
     privileged: 'false'
     network: bridge
     exclude:
-      - {'tag': 'leguer', 'test': 'sig_network'}
-      - {'tag': 'leguer', 'test': 'sig_network_features'}
-      - {'tag': 'leguer', 'test': 'sig_storage'}
-      - {'tag': 'kali', 'test': 'sig_network'}
-      - {'tag': 'kali', 'test': 'sig_network_features'}
-      - {'tag': 'kali', 'test': 'sig_storage'}
       - {'tag': 'jerma', 'test': 'sig_network'}
       - {'tag': 'jerma', 'test': 'sig_network_features'}
       - {'tag': 'jerma', 'test': 'sig_storage'}
@@ -277,12 +271,6 @@
       - {'tag': 'hunter', 'test': 'sig_network'}
       - {'tag': 'hunter', 'test': 'sig_network_features'}
       - {'tag': 'hunter', 'test': 'sig_storage'}
-      - {'tag': 'arm-leguer', 'test': 'sig_network'}
-      - {'tag': 'arm-leguer', 'test': 'sig_network_features'}
-      - {'tag': 'arm-leguer', 'test': 'sig_storage'}
-      - {'tag': 'arm-kali', 'test': 'sig_network'}
-      - {'tag': 'arm-kali', 'test': 'sig_network_features'}
-      - {'tag': 'arm-kali', 'test': 'sig_storage'}
       - {'tag': 'arm-jerma', 'test': 'sig_network'}
       - {'tag': 'arm-jerma', 'test': 'sig_network_features'}
       - {'tag': 'arm-jerma', 'test': 'sig_storage'}
@@ -292,12 +280,6 @@
       - {'tag': 'arm-hunter', 'test': 'sig_network'}
       - {'tag': 'arm-hunter', 'test': 'sig_network_features'}
       - {'tag': 'arm-hunter', 'test': 'sig_storage'}
-      - {'tag': 'arm64-leguer', 'test': 'sig_network'}
-      - {'tag': 'arm64-leguer', 'test': 'sig_network_features'}
-      - {'tag': 'arm64-leguer', 'test': 'sig_storage'}
-      - {'tag': 'arm64-kali', 'test': 'sig_network'}
-      - {'tag': 'arm64-kali', 'test': 'sig_network_features'}
-      - {'tag': 'arm64-kali', 'test': 'sig_storage'}
       - {'tag': 'arm64-jerma', 'test': 'sig_network'}
       - {'tag': 'arm64-jerma', 'test': 'sig_network_features'}
       - {'tag': 'arm64-jerma', 'test': 'sig_storage'}
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 2c584b309..023a33f99 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -262,12 +262,6 @@
     privileged: 'false'
     network: bridge
     exclude:
-      - {'tag': 'leguer', 'test': 'sig_network'}
-      - {'tag': 'leguer', 'test': 'sig_network_features'}
-      - {'tag': 'leguer', 'test': 'sig_storage'}
-      - {'tag': 'kali', 'test': 'sig_network'}
-      - {'tag': 'kali', 'test': 'sig_network_features'}
-      - {'tag': 'kali', 'test': 'sig_storage'}
       - {'tag': 'jerma', 'test': 'sig_network'}
       - {'tag': 'jerma', 'test': 'sig_network_features'}
       - {'tag': 'jerma', 'test': 'sig_storage'}
@@ -590,13 +584,15 @@
     builders:
       - shell: |
           set +x
-          apt-get update && apt-get install software-properties-common gpg -y
+          apt-get update && 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 \
             python3.7 python3.7-dev python3.6 python3.6-dev \
             python python-dev python3-pip enchant -y
           pip3 install tox tox-pip-version
+
           tox
 
 - job-template:
@@ -996,6 +992,7 @@
     builders:
       - shell: |
           apt-get update && apt-get install curl -y
+
           curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b .
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 0c16041e2..30a90c5f5 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -799,13 +799,15 @@
     builders:
       - shell: |
           set +x
-          sudo apt-get update && sudo apt-get install software-properties-common gpg -y
+          sudo apt-get update && sudo 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 \
             python3.7 python3.7-dev python3.6 python3.6-dev \
             python python-dev python3-pip enchant -y
           sudo pip3 install tox tox-pip-version
+
           tox
 
 - job-template:
@@ -1348,6 +1350,7 @@
     builders:
       - shell: |
           sudo apt-get update && sudo apt-get install curl -y
+
           curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sudo sh -s -- -b .
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index 5484a59f7..9bb7e5752 100644
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -444,13 +444,15 @@
     builders:
       - shell: |
           set +x
-          sudo apt-get update && sudo apt-get install software-properties-common gpg -y
+          sudo apt-get update && sudo 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 \
             python3.7 python3.7-dev python3.6 python3.6-dev \
             python python-dev python3-pip enchant -y
           sudo pip3 install tox tox-pip-version
+
           tox
 
 - job-template:
@@ -719,6 +721,7 @@
     builders:
       - shell: |
           sudo apt-get update && sudo apt-get install curl -y
+
           curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sudo sh -s -- -b .
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}