Revert "Remove all Functest K8S v1.24 and v1.25 jobs"

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

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index a31ed12..45dbad7 100644 (file)
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -13,38 +13,38 @@
           from:
           build_args:
           branch: master
-          node: lf-virtual1-9
+          node: v1.30
+          dependency: 3.16
+      - v1.28:
+          from:
+          build_args:
+          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: lf-virtual1-1
+          node: v1.26
           dependency: 3.16
       - v1.25:
           from:
           build_args:
           branch: stable/v1.25
-          node: lf-virtual1-8
+          node: v1.26
           dependency: 3.16
       - v1.24:
           from:
           build_args:
           branch: stable/v1.24
-          node: lf-virtual1-7
+          node: v1.26
           dependency: 3.16
-      - v1.23:
-          from:
-          build_args:
-          branch: stable/v1.23
-          node: lf-virtual1-6
-          dependency: 3.14
-      - v1.22:
-          from:
-          build_args:
-          branch: stable/v1.22
-          node: lf-virtual1-5
-          dependency: 3.14
 
 - functest-kubernetes-opnfv-functest-kubernetes-healthcheck-params: &functest-kubernetes-opnfv-functest-kubernetes-healthcheck-params
     name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-params'
@@ -56,38 +56,38 @@
           from:
           build_args:
           branch: master
-          node: lf-virtual1-9
+          node: v1.30
+          dependency: 3.16
+      - v1.28:
+          from:
+          build_args:
+          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: lf-virtual1-1
+          node: v1.26
           dependency: 3.16
       - v1.25:
           from:
           build_args:
           branch: stable/v1.25
-          node: lf-virtual1-8
+          node: v1.26
           dependency: 3.16
       - v1.24:
           from:
           build_args:
           branch: stable/v1.24
-          node: lf-virtual1-7
+          node: v1.26
           dependency: 3.16
-      - v1.23:
-          from:
-          build_args:
-          branch: stable/v1.23
-          node: lf-virtual1-6
-          dependency: 3.14
-      - v1.22:
-          from:
-          build_args:
-          branch: stable/v1.22
-          node: lf-virtual1-5
-          dependency: 3.14
 
 - functest-kubernetes-opnfv-functest-kubernetes-smoke-params: &functest-kubernetes-opnfv-functest-kubernetes-smoke-params
     name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-params'
@@ -99,38 +99,38 @@
           from:
           build_args:
           branch: master
-          node: lf-virtual1-9
+          node: v1.30
+          dependency: 3.16
+      - v1.28:
+          from:
+          build_args:
+          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: lf-virtual1-1
+          node: v1.26
           dependency: 3.16
       - v1.25:
           from:
           build_args:
           branch: stable/v1.25
-          node: lf-virtual1-8
+          node: v1.26
           dependency: 3.16
       - v1.24:
           from:
           build_args:
           branch: stable/v1.24
-          node: lf-virtual1-7
+          node: v1.26
           dependency: 3.16
-      - v1.23:
-          from:
-          build_args:
-          branch: stable/v1.23
-          node: lf-virtual1-6
-          dependency: 3.14
-      - v1.22:
-          from:
-          build_args:
-          branch: stable/v1.22
-          node: lf-virtual1-5
-          dependency: 3.14
 
 - functest-kubernetes-opnfv-functest-kubernetes-security-params: &functest-kubernetes-opnfv-functest-kubernetes-security-params
     name: 'functest-kubernetes-opnfv-functest-kubernetes-security-params'
@@ -142,38 +142,38 @@
           from:
           build_args:
           branch: master
-          node: lf-virtual1-9
+          node: v1.30
+          dependency: 3.16
+      - v1.28:
+          from:
+          build_args:
+          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: lf-virtual1-1
+          node: v1.26
           dependency: 3.16
       - v1.25:
           from:
           build_args:
           branch: stable/v1.25
-          node: lf-virtual1-8
+          node: v1.26
           dependency: 3.16
       - v1.24:
           from:
           build_args:
           branch: stable/v1.24
-          node: lf-virtual1-7
+          node: v1.26
           dependency: 3.16
-      - v1.23:
-          from:
-          build_args:
-          branch: stable/v1.23
-          node: lf-virtual1-6
-          dependency: 3.14
-      - v1.22:
-          from:
-          build_args:
-          branch: stable/v1.22
-          node: lf-virtual1-5
-          dependency: 3.14
 
 - functest-kubernetes-opnfv-functest-kubernetes-benchmarking-params: &functest-kubernetes-opnfv-functest-kubernetes-benchmarking-params
     name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-params'
@@ -185,38 +185,38 @@
           from:
           build_args:
           branch: master
-          node: lf-virtual1-9
+          node: v1.30
+          dependency: 3.16
+      - v1.28:
+          from:
+          build_args:
+          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: lf-virtual1-1
+          node: v1.26
           dependency: 3.16
       - v1.25:
           from:
           build_args:
           branch: stable/v1.25
-          node: lf-virtual1-8
+          node: v1.26
           dependency: 3.16
       - v1.24:
           from:
           build_args:
           branch: stable/v1.24
-          node: lf-virtual1-7
+          node: v1.26
           dependency: 3.16
-      - v1.23:
-          from:
-          build_args:
-          branch: stable/v1.23
-          node: lf-virtual1-6
-          dependency: 3.14
-      - v1.22:
-          from:
-          build_args:
-          branch: stable/v1.22
-          node: lf-virtual1-5
-          dependency: 3.14
 
 - functest-kubernetes-opnfv-functest-kubernetes-cnf-params: &functest-kubernetes-opnfv-functest-kubernetes-cnf-params
     name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-params'
@@ -228,38 +228,38 @@
           from:
           build_args:
           branch: master
-          node: lf-virtual1-9
+          node: v1.30
+          dependency: 3.16
+      - v1.28:
+          from:
+          build_args:
+          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: lf-virtual1-1
+          node: v1.26
           dependency: 3.16
       - v1.25:
           from:
           build_args:
           branch: stable/v1.25
-          node: lf-virtual1-8
+          node: v1.26
           dependency: 3.16
       - v1.24:
           from:
           build_args:
           branch: stable/v1.24
-          node: lf-virtual1-7
+          node: v1.26
           dependency: 3.16
-      - v1.23:
-          from:
-          build_args:
-          branch: stable/v1.23
-          node: lf-virtual1-6
-          dependency: 3.14
-      - v1.22:
-          from:
-          build_args:
-          branch: stable/v1.22
-          node: lf-virtual1-5
-          dependency: 3.14
 
 - functest-kubernetes-jobs: &functest-kubernetes-jobs
     name: 'functest-kubernetes-jobs'
@@ -995,16 +995,16 @@
     tag:
       - latest:
           dependency: 3.16
+      - v1.28:
+          dependency: 3.16
+      - v1.27:
+          dependency: 3.16
       - v1.26:
           dependency: 3.16
       - v1.25:
           dependency: 3.16
       - v1.24:
           dependency: 3.16
-      - v1.23:
-          dependency: 3.14
-      - v1.22:
-          dependency: 3.14
 
 - project:
     name: 'functest-kubernetes-dep-pull'
@@ -1046,7 +1046,7 @@
             python3.9 python3.9-dev python3.9-distutils \
             python3.8 python3.8-dev python3.8-distutils \
             python3-pip enchant-2 -y
-          pip3 install tox tox-pip-version
+          pip3 install tox
 
           tox