2 files changed, 107 insertions, 155 deletions

diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index 363e6de51..ba17015db 100644
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -10,35 +10,27 @@
     name: 'functest-kubernetes-pi-params'
     tag:
       - latest:
+          node: latest
+      - v1.31:
+          node: v1.31
+      - v1.30:
           node: v1.30
       - v1.29:
           node: v1.29
       - v1.28:
           node: v1.28
-      - v1.27:
-          node: v1.27
-      - v1.26:
-          node: v1.26
       - arm-latest:
           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: v1.26
       - arm64-latest:
           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: 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'
@@ -47,35 +39,27 @@
     port:
     tag:
       - latest:
+          node: latest
+      - v1.31:
+          node: v1.31
+      - v1.30:
           node: v1.30
       - v1.29:
           node: v1.29
       - v1.28:
           node: v1.28
-      - v1.27:
-          node: v1.27
-      - v1.26:
-          node: v1.26
       - arm-latest:
           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: v1.26
       - arm64-latest:
           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: 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'
@@ -84,35 +68,27 @@
     port:
     tag:
       - latest:
+          node: latest
+      - v1.31:
+          node: v1.31
+      - v1.30:
           node: v1.30
       - v1.29:
           node: v1.29
       - v1.28:
           node: v1.28
-      - v1.27:
-          node: v1.27
-      - v1.26:
-          node: v1.26
       - arm-latest:
           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: v1.26
       - arm64-latest:
           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: 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'
@@ -121,35 +97,27 @@
     port:
     tag:
       - latest:
+          node: latest
+      - v1.31:
+          node: v1.31
+      - v1.30:
           node: v1.30
       - v1.29:
           node: v1.29
       - v1.28:
           node: v1.28
-      - v1.27:
-          node: v1.27
-      - v1.26:
-          node: v1.26
       - arm-latest:
           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: v1.26
       - arm64-latest:
           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: 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'
@@ -158,35 +126,27 @@
     port:
     tag:
       - latest:
+          node: latest
+      - v1.31:
+          node: v1.31
+      - v1.30:
           node: v1.30
       - v1.29:
           node: v1.29
       - v1.28:
           node: v1.28
-      - v1.27:
-          node: v1.27
-      - v1.26:
-          node: v1.26
       - arm-latest:
           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: v1.26
       - arm64-latest:
           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: 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'
@@ -195,35 +155,27 @@
     port:
     tag:
       - latest:
+          node: latest
+      - v1.31:
+          node: v1.31
+      - v1.30:
           node: v1.30
       - v1.29:
           node: v1.29
       - v1.28:
           node: v1.28
-      - v1.27:
-          node: v1.27
-      - v1.26:
-          node: v1.26
       - arm-latest:
           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: v1.26
       - arm64-latest:
           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: v1.26
 
 - _functest-kubernetes-pi-jobs: &functest-kubernetes-pi-jobs
     name: 'functest-kubernetes-pi-jobs'
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 348da2d7b..93066e343 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -13,8 +13,20 @@
           from:
           build_args:
           branch: master
+          node: latest
+          dependency: 3.20
+      - v1.31:
+          from:
+          build_args:
+          branch: stable/v1.31
+          node: v1.31
+          dependency: 3.20
+      - v1.30:
+          from:
+          build_args:
+          branch: stable/v1.30
           node: v1.30
-          dependency: 3.16
+          dependency: 3.20
       - v1.29:
           from:
           build_args:
@@ -27,18 +39,6 @@
           branch: stable/v1.28
           node: v1.28
           dependency: 3.16
-      - v1.27:
-          from:
-          build_args:
-          branch: stable/v1.27
-          node: v1.27
-          dependency: 3.16
-      - v1.26:
-          from:
-          build_args:
-          branch: stable/v1.26
-          node: v1.26
-          dependency: 3.16
 
 - _functest-kubernetes-opnfv-functest-kubernetes-healthcheck-params: &functest-kubernetes-opnfv-functest-kubernetes-healthcheck-params
     name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-params'
@@ -50,8 +50,20 @@
           from:
           build_args:
           branch: master
+          node: latest
+          dependency: 3.20
+      - v1.31:
+          from:
+          build_args:
+          branch: stable/v1.31
+          node: v1.31
+          dependency: 3.20
+      - v1.30:
+          from:
+          build_args:
+          branch: stable/v1.30
           node: v1.30
-          dependency: 3.16
+          dependency: 3.20
       - v1.29:
           from:
           build_args:
@@ -64,18 +76,6 @@
           branch: stable/v1.28
           node: v1.28
           dependency: 3.16
-      - v1.27:
-          from:
-          build_args:
-          branch: stable/v1.27
-          node: v1.27
-          dependency: 3.16
-      - v1.26:
-          from:
-          build_args:
-          branch: stable/v1.26
-          node: v1.26
-          dependency: 3.16
 
 - _functest-kubernetes-opnfv-functest-kubernetes-smoke-params: &functest-kubernetes-opnfv-functest-kubernetes-smoke-params
     name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-params'
@@ -87,8 +87,20 @@
           from:
           build_args:
           branch: master
+          node: latest
+          dependency: 3.20
+      - v1.31:
+          from:
+          build_args:
+          branch: stable/v1.31
+          node: v1.31
+          dependency: 3.20
+      - v1.30:
+          from:
+          build_args:
+          branch: stable/v1.30
           node: v1.30
-          dependency: 3.16
+          dependency: 3.20
       - v1.29:
           from:
           build_args:
@@ -101,18 +113,6 @@
           branch: stable/v1.28
           node: v1.28
           dependency: 3.16
-      - v1.27:
-          from:
-          build_args:
-          branch: stable/v1.27
-          node: v1.27
-          dependency: 3.16
-      - v1.26:
-          from:
-          build_args:
-          branch: stable/v1.26
-          node: v1.26
-          dependency: 3.16
 
 - _functest-kubernetes-opnfv-functest-kubernetes-security-params: &functest-kubernetes-opnfv-functest-kubernetes-security-params
     name: 'functest-kubernetes-opnfv-functest-kubernetes-security-params'
@@ -124,8 +124,20 @@
           from:
           build_args:
           branch: master
+          node: latest
+          dependency: 3.20
+      - v1.31:
+          from:
+          build_args:
+          branch: stable/v1.31
+          node: v1.31
+          dependency: 3.20
+      - v1.30:
+          from:
+          build_args:
+          branch: stable/v1.30
           node: v1.30
-          dependency: 3.16
+          dependency: 3.20
       - v1.29:
           from:
           build_args:
@@ -138,18 +150,6 @@
           branch: stable/v1.28
           node: v1.28
           dependency: 3.16
-      - v1.27:
-          from:
-          build_args:
-          branch: stable/v1.27
-          node: v1.27
-          dependency: 3.16
-      - v1.26:
-          from:
-          build_args:
-          branch: stable/v1.26
-          node: v1.26
-          dependency: 3.16
 
 - _functest-kubernetes-opnfv-functest-kubernetes-benchmarking-params: &functest-kubernetes-opnfv-functest-kubernetes-benchmarking-params
     name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-params'
@@ -161,8 +161,20 @@
           from:
           build_args:
           branch: master
+          node: latest
+          dependency: 3.20
+      - v1.31:
+          from:
+          build_args:
+          branch: stable/v1.31
+          node: v1.31
+          dependency: 3.20
+      - v1.30:
+          from:
+          build_args:
+          branch: stable/v1.30
           node: v1.30
-          dependency: 3.16
+          dependency: 3.20
       - v1.29:
           from:
           build_args:
@@ -175,18 +187,6 @@
           branch: stable/v1.28
           node: v1.28
           dependency: 3.16
-      - v1.27:
-          from:
-          build_args:
-          branch: stable/v1.27
-          node: v1.27
-          dependency: 3.16
-      - v1.26:
-          from:
-          build_args:
-          branch: stable/v1.26
-          node: v1.26
-          dependency: 3.16
 
 - _functest-kubernetes-opnfv-functest-kubernetes-cnf-params: &functest-kubernetes-opnfv-functest-kubernetes-cnf-params
     name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-params'
@@ -198,8 +198,20 @@
           from:
           build_args:
           branch: master
+          node: latest
+          dependency: 3.20
+      - v1.31:
+          from:
+          build_args:
+          branch: stable/v1.31
+          node: v1.31
+          dependency: 3.20
+      - v1.30:
+          from:
+          build_args:
+          branch: stable/v1.30
           node: v1.30
-          dependency: 3.16
+          dependency: 3.20
       - v1.29:
           from:
           build_args:
@@ -212,18 +224,6 @@
           branch: stable/v1.28
           node: v1.28
           dependency: 3.16
-      - v1.27:
-          from:
-          build_args:
-          branch: stable/v1.27
-          node: v1.27
-          dependency: 3.16
-      - v1.26:
-          from:
-          build_args:
-          branch: stable/v1.26
-          node: v1.26
-          dependency: 3.16
 
 - _functest-kubernetes-jobs: &functest-kubernetes-jobs
     name: 'functest-kubernetes-jobs'
@@ -959,15 +959,15 @@
     port:
     tag:
       - latest:
-          dependency: 3.16
+          dependency: 3.20
+      - v1.31:
+          dependency: 3.20
+      - v1.30:
+          dependency: 3.20
       - v1.29:
           dependency: 3.16
       - v1.28:
           dependency: 3.16
-      - v1.27:
-          dependency: 3.16
-      - v1.26:
-          dependency: 3.16
 
 - project:
     name: 'functest-kubernetes-dep-pull'