Merge "Clean also any Jenkins or Gitlab cluster"

[releng.git] / jjb / functest / functest.yaml

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 0c16041..2ae0995 100644 (file)
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -15,8 +15,15 @@
           from:
           buildargs:
           branch: master
-          slave: lf-virtual9
-          DASHBOARD_URL: http://172.30.13.94
+          slave: lf-pod4-2
+          DASHBOARD_URL: http://172.30.12.85
+          dependency: 3.13
+      - wallaby:
+          from:
+          buildargs:
+          branch: stable/wallaby
+          slave: lf-virtual6
+          DASHBOARD_URL: http://172.30.13.91
           dependency: 3.13
       - leguer:
           from:
@@ -39,20 +46,6 @@
           slave: lf-pod4
           DASHBOARD_URL: http://172.30.12.83
           dependency: 3.10
-      - iruya:
-          from:
-          buildargs:
-          branch: stable/iruya
-          slave: lf-virtual4
-          DASHBOARD_URL: http://172.30.13.89
-          dependency: 3.9
-      - hunter:
-          from:
-          buildargs:
-          branch: stable/hunter
-          slave: lf-virtual6
-          DASHBOARD_URL: http://172.30.13.91
-          dependency: 3.9
 
 - functest-jobs: &functest-jobs
     name: 'functest-jobs'
@@ -335,6 +328,10 @@
       - {'tag': 'latest', 'test': 'networking-bgpvpn'}
       - {'tag': 'latest', 'test': 'networking-sfc'}
       - {'tag': 'latest', 'test': 'patrole'}
+      - {'tag': 'wallaby', 'test': 'refstack_defcore'}
+      - {'tag': 'wallaby', 'test': 'networking-bgpvpn'}
+      - {'tag': 'wallaby', 'test': 'networking-sfc'}
+      - {'tag': 'wallaby', 'test': 'patrole'}
       - {'tag': 'leguer', 'test': 'refstack_defcore'}
       - {'tag': 'leguer', 'test': 'networking-bgpvpn'}
       - {'tag': 'leguer', 'test': 'networking-sfc'}
@@ -352,20 +349,6 @@
       - {'tag': 'jerma', 'test': 'patrole_member'}
       - {'tag': 'jerma', 'test': 'patrole_reader'}
       - {'tag': 'jerma', 'test': 'tempest_cyborg'}
-      - {'tag': 'iruya', 'test': 'refstack_defcore'}
-      - {'tag': 'iruya', 'test': 'patrole_admin'}
-      - {'tag': 'iruya', 'test': 'patrole_member'}
-      - {'tag': 'iruya', 'test': 'patrole_reader'}
-      - {'tag': 'iruya', 'test': 'tempest_cyborg'}
-      - {'tag': 'hunter', 'test': 'refstack_compute'}
-      - {'tag': 'hunter', 'test': 'refstack_object'}
-      - {'tag': 'hunter', 'test': 'refstack_platform'}
-      - {'tag': 'hunter', 'test': 'tempest_octavia'}
-      - {'tag': 'hunter', 'test': 'tempest_telemetry'}
-      - {'tag': 'hunter', 'test': 'patrole_admin'}
-      - {'tag': 'hunter', 'test': 'patrole_member'}
-      - {'tag': 'hunter', 'test': 'patrole_reader'}
-      - {'tag': 'hunter', 'test': 'tempest_cyborg'}
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
@@ -743,10 +726,10 @@
           set +x
           if [ "_" = "_" ]; then
             image=alpine:{dependency}
-          elif [ "_" = "None" ]; then
+          elif [ "None" = "None" ]; then
             image=_/alpine:{dependency}
           else
-            image=_:/alpine{dependency}
+            image=_:/alpine:{dependency}
           fi
           sudo docker pull $image || true
 
@@ -757,10 +740,10 @@
           set +x
           if [ "_" = "_" ]; then
             image=alpine:{dependency}
-          elif [ "_" = "None" ]; then
+          elif [ "" = "None" ]; then
             image=_/alpine:{dependency}
           else
-            image=_:/alpine{dependency}
+            image=_:/alpine:{dependency}
           fi
           sudo docker rmi $image || true
 
@@ -799,13 +782,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 \
+          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:
@@ -859,6 +844,7 @@
     path: docker/tempest
     exclude:
       - {'tag': 'latest'}
+      - {'tag': 'wallaby'}
       - {'tag': 'leguer'}
       - {'tag': 'kali'}
       - {'tag': 'jerma'}
@@ -1225,6 +1211,7 @@
     path: docker/tempest
     exclude:
       - {'tag': 'latest'}
+      - {'tag': 'wallaby'}
       - {'tag': 'leguer'}
       - {'tag': 'kali'}
       - {'tag': 'jerma'}
@@ -1348,6 +1335,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}