X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-kubernetes-pi.yaml;h=efab56c05d91408d0c88a56c5ac2d30bd7fab190;hb=8443e6f9195b01c0edfef69a2040034fe764bf9b;hp=73d3e0cc67bf07f68328d1e3a7caca5e65aaa528;hpb=94894ae211bd21a309c46a7eb3c86118ae78b673;p=releng.git

diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index 73d3e0cc6..efab56c05 100644
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -10,41 +10,35 @@
     name: 'functest-kubernetes-pi-params'
     tag:
       - latest:
-          node: lf-virtual1-9
+          node: v1.30
+      - v1.29:
+          node: v1.29
+      - v1.28:
+          node: v1.28
+      - v1.27:
+          node: v1.27
       - v1.26:
-          node: lf-virtual1-1
-      - v1.25:
-          node: lf-virtual1-8
-      - v1.24:
-          node: lf-virtual1-7
-      - v1.23:
-          node: lf-virtual1-6
-      - v1.22:
-          node: lf-virtual1-5
+          node: v1.26
       - arm-latest:
-          node: lf-virtual1-9
+          node: v1.30
+      - arm-v1.29:
+          node: v1.29
+      - arm-v1.28:
+          node: v1.28
+      - arm-v1.27:
+          node: v1.27
       - arm-v1.26:
-          node: lf-virtual1-1
-      - arm-v1.25:
-          node: lf-virtual1-8
-      - arm-v1.24:
-          node: lf-virtual1-7
-      - arm-v1.23:
-          node: lf-virtual1-6
-      - arm-v1.22:
-          node: lf-virtual1-5
+          node: v1.26
       - arm64-latest:
-          node: lf-virtual1-9
+          node: v1.30
+      - arm64-v1.29:
+          node: v1.29
+      - arm64-v1.28:
+          node: v1.28
+      - arm64-v1.27:
+          node: v1.27
       - arm64-v1.26:
-          node: lf-virtual1-1
-      - arm64-v1.25:
-          node: lf-virtual1-8
-      - arm64-v1.24:
-          node: lf-virtual1-7
-      - arm64-v1.23:
-          node: lf-virtual1-6
-      - arm64-v1.22:
-          node: lf-virtual1-5
+          node: v1.26
 
 - functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-params: &functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-params
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-params'
@@ -53,41 +47,35 @@
     port:
     tag:
       - latest:
-          node: lf-virtual1-9
+          node: v1.30
+      - v1.29:
+          node: v1.29
+      - v1.28:
+          node: v1.28
+      - v1.27:
+          node: v1.27
       - v1.26:
-          node: lf-virtual1-1
-      - v1.25:
-          node: lf-virtual1-8
-      - v1.24:
-          node: lf-virtual1-7
-      - v1.23:
-          node: lf-virtual1-6
-      - v1.22:
-          node: lf-virtual1-5
+          node: v1.26
       - arm-latest:
-          node: lf-virtual1-9
+          node: v1.30
+      - arm-v1.29:
+          node: v1.29
+      - arm-v1.28:
+          node: v1.28
+      - arm-v1.27:
+          node: v1.27
       - arm-v1.26:
-          node: lf-virtual1-1
-      - arm-v1.25:
-          node: lf-virtual1-8
-      - arm-v1.24:
-          node: lf-virtual1-7
-      - arm-v1.23:
-          node: lf-virtual1-6
-      - arm-v1.22:
-          node: lf-virtual1-5
+          node: v1.26
       - arm64-latest:
-          node: lf-virtual1-9
+          node: v1.30
+      - arm64-v1.29:
+          node: v1.29
+      - arm64-v1.28:
+          node: v1.28
+      - arm64-v1.27:
+          node: v1.27
       - arm64-v1.26:
-          node: lf-virtual1-1
-      - arm64-v1.25:
-          node: lf-virtual1-8
-      - arm64-v1.24:
-          node: lf-virtual1-7
-      - arm64-v1.23:
-          node: lf-virtual1-6
-      - arm64-v1.22:
-          node: lf-virtual1-5
+          node: v1.26
 
 - functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-params: &functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-params
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-params'
@@ -96,41 +84,35 @@
     port:
     tag:
       - latest:
-          node: lf-virtual1-9
+          node: v1.30
+      - v1.29:
+          node: v1.29
+      - v1.28:
+          node: v1.28
+      - v1.27:
+          node: v1.27
       - v1.26:
-          node: lf-virtual1-1
-      - v1.25:
-          node: lf-virtual1-8
-      - v1.24:
-          node: lf-virtual1-7
-      - v1.23:
-          node: lf-virtual1-6
-      - v1.22:
-          node: lf-virtual1-5
+          node: v1.26
       - arm-latest:
-          node: lf-virtual1-9
+          node: v1.30
+      - arm-v1.29:
+          node: v1.29
+      - arm-v1.28:
+          node: v1.28
+      - arm-v1.27:
+          node: v1.27
       - arm-v1.26:
-          node: lf-virtual1-1
-      - arm-v1.25:
-          node: lf-virtual1-8
-      - arm-v1.24:
-          node: lf-virtual1-7
-      - arm-v1.23:
-          node: lf-virtual1-6
-      - arm-v1.22:
-          node: lf-virtual1-5
+          node: v1.26
       - arm64-latest:
-          node: lf-virtual1-9
+          node: v1.30
+      - arm64-v1.29:
+          node: v1.29
+      - arm64-v1.28:
+          node: v1.28
+      - arm64-v1.27:
+          node: v1.27
       - arm64-v1.26:
-          node: lf-virtual1-1
-      - arm64-v1.25:
-          node: lf-virtual1-8
-      - arm64-v1.24:
-          node: lf-virtual1-7
-      - arm64-v1.23:
-          node: lf-virtual1-6
-      - arm64-v1.22:
-          node: lf-virtual1-5
+          node: v1.26
 
 - functest-kubernetes-pi-ollivier-functest-kubernetes-security-params: &functest-kubernetes-pi-ollivier-functest-kubernetes-security-params
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-params'
@@ -139,41 +121,35 @@
     port:
     tag:
       - latest:
-          node: lf-virtual1-9
+          node: v1.30
+      - v1.29:
+          node: v1.29
+      - v1.28:
+          node: v1.28
+      - v1.27:
+          node: v1.27
       - v1.26:
-          node: lf-virtual1-1
-      - v1.25:
-          node: lf-virtual1-8
-      - v1.24:
-          node: lf-virtual1-7
-      - v1.23:
-          node: lf-virtual1-6
-      - v1.22:
-          node: lf-virtual1-5
+          node: v1.26
       - arm-latest:
-          node: lf-virtual1-9
+          node: v1.30
+      - arm-v1.29:
+          node: v1.29
+      - arm-v1.28:
+          node: v1.28
+      - arm-v1.27:
+          node: v1.27
       - arm-v1.26:
-          node: lf-virtual1-1
-      - arm-v1.25:
-          node: lf-virtual1-8
-      - arm-v1.24:
-          node: lf-virtual1-7
-      - arm-v1.23:
-          node: lf-virtual1-6
-      - arm-v1.22:
-          node: lf-virtual1-5
+          node: v1.26
       - arm64-latest:
-          node: lf-virtual1-9
+          node: v1.30
+      - arm64-v1.29:
+          node: v1.29
+      - arm64-v1.28:
+          node: v1.28
+      - arm64-v1.27:
+          node: v1.27
       - arm64-v1.26:
-          node: lf-virtual1-1
-      - arm64-v1.25:
-          node: lf-virtual1-8
-      - arm64-v1.24:
-          node: lf-virtual1-7
-      - arm64-v1.23:
-          node: lf-virtual1-6
-      - arm64-v1.22:
-          node: lf-virtual1-5
+          node: v1.26
 
 - functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-params: &functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-params
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-params'
@@ -182,41 +158,35 @@
     port:
     tag:
       - latest:
-          node: lf-virtual1-9
+          node: v1.30
+      - v1.29:
+          node: v1.29
+      - v1.28:
+          node: v1.28
+      - v1.27:
+          node: v1.27
       - v1.26:
-          node: lf-virtual1-1
-      - v1.25:
-          node: lf-virtual1-8
-      - v1.24:
-          node: lf-virtual1-7
-      - v1.23:
-          node: lf-virtual1-6
-      - v1.22:
-          node: lf-virtual1-5
+          node: v1.26
       - arm-latest:
-          node: lf-virtual1-9
+          node: v1.30
+      - arm-v1.29:
+          node: v1.29
+      - arm-v1.28:
+          node: v1.28
+      - arm-v1.27:
+          node: v1.27
       - arm-v1.26:
-          node: lf-virtual1-1
-      - arm-v1.25:
-          node: lf-virtual1-8
-      - arm-v1.24:
-          node: lf-virtual1-7
-      - arm-v1.23:
-          node: lf-virtual1-6
-      - arm-v1.22:
-          node: lf-virtual1-5
+          node: v1.26
       - arm64-latest:
-          node: lf-virtual1-9
+          node: v1.30
+      - arm64-v1.29:
+          node: v1.29
+      - arm64-v1.28:
+          node: v1.28
+      - arm64-v1.27:
+          node: v1.27
       - arm64-v1.26:
-          node: lf-virtual1-1
-      - arm64-v1.25:
-          node: lf-virtual1-8
-      - arm64-v1.24:
-          node: lf-virtual1-7
-      - arm64-v1.23:
-          node: lf-virtual1-6
-      - arm64-v1.22:
-          node: lf-virtual1-5
+          node: v1.26
 
 - functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-params: &functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-params
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-params'
@@ -225,41 +195,35 @@
     port:
     tag:
       - latest:
-          node: lf-virtual1-9
+          node: v1.30
+      - v1.29:
+          node: v1.29
+      - v1.28:
+          node: v1.28
+      - v1.27:
+          node: v1.27
       - v1.26:
-          node: lf-virtual1-1
-      - v1.25:
-          node: lf-virtual1-8
-      - v1.24:
-          node: lf-virtual1-7
-      - v1.23:
-          node: lf-virtual1-6
-      - v1.22:
-          node: lf-virtual1-5
+          node: v1.26
       - arm-latest:
-          node: lf-virtual1-9
+          node: v1.30
+      - arm-v1.29:
+          node: v1.29
+      - arm-v1.28:
+          node: v1.28
+      - arm-v1.27:
+          node: v1.27
       - arm-v1.26:
-          node: lf-virtual1-1
-      - arm-v1.25:
-          node: lf-virtual1-8
-      - arm-v1.24:
-          node: lf-virtual1-7
-      - arm-v1.23:
-          node: lf-virtual1-6
-      - arm-v1.22:
-          node: lf-virtual1-5
+          node: v1.26
       - arm64-latest:
-          node: lf-virtual1-9
+          node: v1.30
+      - arm64-v1.29:
+          node: v1.29
+      - arm64-v1.28:
+          node: v1.28
+      - arm64-v1.27:
+          node: v1.27
       - arm64-v1.26:
-          node: lf-virtual1-1
-      - arm64-v1.25:
-          node: lf-virtual1-8
-      - arm64-v1.24:
-          node: lf-virtual1-7
-      - arm64-v1.23:
-          node: lf-virtual1-6
-      - arm64-v1.22:
-          node: lf-virtual1-5
+          node: v1.26
 
 - functest-kubernetes-pi-jobs: &functest-kubernetes-pi-jobs
     name: 'functest-kubernetes-pi-jobs'
@@ -767,7 +731,7 @@
           <<: *functest-kubernetes-pi-run-containers
 
 - project:
-    name: 'functest-kubernetes-pi-{tag}-zip'
+    name: 'functest-kubernetes-pi-zip'
     <<: *functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-params
     volumes:
       - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config