Generate Functest K8s all v1.31 and v30 jobs

Change-Id: Id267e7e53e8e34c6823cac0b4ca160a2f98d20c8
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index efab56c..ba17015 100644 (file)
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -1,231 +1,183 @@
 ---
 ---

-- functest-kubernetes-pi-containers: &functest-kubernetes-pi-containers
+- _functest-kubernetes-pi-containers: &functest-kubernetes-pi-containers

     name: 'functest-kubernetes-pi-containers'
     repo: '{repo}'
     port: '{port}'
     container: '{container}'
     tag: '{tag}'
 
     name: 'functest-kubernetes-pi-containers'
     repo: '{repo}'
     port: '{port}'
     container: '{container}'
     tag: '{tag}'
 

-- functest-kubernetes-pi-params: &functest-kubernetes-pi-params
+- _functest-kubernetes-pi-params: &functest-kubernetes-pi-params

     name: 'functest-kubernetes-pi-params'
     tag:
       - latest:
     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
           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-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-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
+- _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'
     repo: 'ollivier'
     container: 'functest-kubernetes-healthcheck'
     port:
     tag:
       - latest:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-params'
     repo: 'ollivier'
     container: 'functest-kubernetes-healthcheck'
     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
           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-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-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
+- _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'
     repo: 'ollivier'
     container: 'functest-kubernetes-smoke'
     port:
     tag:
       - latest:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-params'
     repo: 'ollivier'
     container: 'functest-kubernetes-smoke'
     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
           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-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-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
+- _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'
     repo: 'ollivier'
     container: 'functest-kubernetes-security'
     port:
     tag:
       - latest:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-params'
     repo: 'ollivier'
     container: 'functest-kubernetes-security'
     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
           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-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-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
+- _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'
     repo: 'ollivier'
     container: 'functest-kubernetes-benchmarking'
     port:
     tag:
       - latest:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-params'
     repo: 'ollivier'
     container: 'functest-kubernetes-benchmarking'
     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
           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-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-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
+- _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'
     repo: 'ollivier'
     container: 'functest-kubernetes-cnf'
     port:
     tag:
       - latest:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-params'
     repo: 'ollivier'
     container: 'functest-kubernetes-cnf'
     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
           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-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-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
+- _functest-kubernetes-pi-jobs: &functest-kubernetes-pi-jobs

     name: 'functest-kubernetes-pi-jobs'
     current-parameters: true
 
     name: 'functest-kubernetes-pi-jobs'
     current-parameters: true
 


@@ -249,7 +201,7 @@
           name: DEPLOY_SCENARIO
           default: k8-nosdn-nofeature-noha
 
           name: DEPLOY_SCENARIO
           default: k8-nosdn-nofeature-noha
 

-- functest-kubernetes-pi-run-containers: &functest-kubernetes-pi-run-containers
+- _functest-kubernetes-pi-run-containers: &functest-kubernetes-pi-run-containers

     name: 'functest-kubernetes-pi-run-containers'
     <<: *functest-kubernetes-pi-containers
     privileged: '{privileged}'
     name: 'functest-kubernetes-pi-run-containers'
     <<: *functest-kubernetes-pi-containers
     privileged: '{privileged}'


@@ -853,6 +805,7 @@
               <<: *functest-kubernetes-pi-jobs
       - multijob:
           name: ollivier/functest-kubernetes-cnf:{tag}
               <<: *functest-kubernetes-pi-jobs
       - multijob:
           name: ollivier/functest-kubernetes-cnf:{tag}

+          execution-type: SEQUENTIALLY

           projects:
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-k8s_vims-run'
               <<: *functest-kubernetes-pi-jobs
           projects:
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-k8s_vims-run'
               <<: *functest-kubernetes-pi-jobs

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index dcab411..93066e3 100644 (file)
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -1,20 +1,32 @@
 ---
 ---

-- functest-kubernetes-containers: &functest-kubernetes-containers
+- _functest-kubernetes-containers: &functest-kubernetes-containers

     name: 'functest-kubernetes-containers'
     repo: '{repo}'
     port: '{port}'
     container: '{container}'
     tag: '{tag}'
 
     name: 'functest-kubernetes-containers'
     repo: '{repo}'
     port: '{port}'
     container: '{container}'
     tag: '{tag}'
 

-- functest-kubernetes-params: &functest-kubernetes-params
+- _functest-kubernetes-params: &functest-kubernetes-params

     name: 'functest-kubernetes-params'
     tag:
       - latest:
           from:
           build_args:
           branch: master
     name: 'functest-kubernetes-params'
     tag:
       - latest:
           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
           node: v1.30

-          dependency: 3.16
+          dependency: 3.20

       - v1.29:
           from:
           build_args:
       - v1.29:
           from:
           build_args:


@@ -27,20 +39,8 @@
           branch: stable/v1.28
           node: v1.28
           dependency: 3.16
           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
+- _functest-kubernetes-opnfv-functest-kubernetes-healthcheck-params: &functest-kubernetes-opnfv-functest-kubernetes-healthcheck-params

     name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-params'
     repo: 'opnfv'
     container: 'functest-kubernetes-healthcheck'
     name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-params'
     repo: 'opnfv'
     container: 'functest-kubernetes-healthcheck'


@@ -50,8 +50,20 @@
           from:
           build_args:
           branch: master
           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
           node: v1.30

-          dependency: 3.16
+          dependency: 3.20

       - v1.29:
           from:
           build_args:
       - v1.29:
           from:
           build_args:


@@ -64,20 +76,8 @@
           branch: stable/v1.28
           node: v1.28
           dependency: 3.16
           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
+- _functest-kubernetes-opnfv-functest-kubernetes-smoke-params: &functest-kubernetes-opnfv-functest-kubernetes-smoke-params

     name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-params'
     repo: 'opnfv'
     container: 'functest-kubernetes-smoke'
     name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-params'
     repo: 'opnfv'
     container: 'functest-kubernetes-smoke'


@@ -87,8 +87,20 @@
           from:
           build_args:
           branch: master
           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
           node: v1.30

-          dependency: 3.16
+          dependency: 3.20

       - v1.29:
           from:
           build_args:
       - v1.29:
           from:
           build_args:


@@ -101,20 +113,8 @@
           branch: stable/v1.28
           node: v1.28
           dependency: 3.16
           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
+- _functest-kubernetes-opnfv-functest-kubernetes-security-params: &functest-kubernetes-opnfv-functest-kubernetes-security-params

     name: 'functest-kubernetes-opnfv-functest-kubernetes-security-params'
     repo: 'opnfv'
     container: 'functest-kubernetes-security'
     name: 'functest-kubernetes-opnfv-functest-kubernetes-security-params'
     repo: 'opnfv'
     container: 'functest-kubernetes-security'


@@ -124,8 +124,20 @@
           from:
           build_args:
           branch: master
           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
           node: v1.30

-          dependency: 3.16
+          dependency: 3.20

       - v1.29:
           from:
           build_args:
       - v1.29:
           from:
           build_args:


@@ -138,20 +150,8 @@
           branch: stable/v1.28
           node: v1.28
           dependency: 3.16
           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
+- _functest-kubernetes-opnfv-functest-kubernetes-benchmarking-params: &functest-kubernetes-opnfv-functest-kubernetes-benchmarking-params

     name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-params'
     repo: 'opnfv'
     container: 'functest-kubernetes-benchmarking'
     name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-params'
     repo: 'opnfv'
     container: 'functest-kubernetes-benchmarking'


@@ -161,8 +161,20 @@
           from:
           build_args:
           branch: master
           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
           node: v1.30

-          dependency: 3.16
+          dependency: 3.20

       - v1.29:
           from:
           build_args:
       - v1.29:
           from:
           build_args:


@@ -175,20 +187,8 @@
           branch: stable/v1.28
           node: v1.28
           dependency: 3.16
           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
+- _functest-kubernetes-opnfv-functest-kubernetes-cnf-params: &functest-kubernetes-opnfv-functest-kubernetes-cnf-params

     name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-params'
     repo: 'opnfv'
     container: 'functest-kubernetes-cnf'
     name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-params'
     repo: 'opnfv'
     container: 'functest-kubernetes-cnf'


@@ -198,8 +198,20 @@
           from:
           build_args:
           branch: master
           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
           node: v1.30

-          dependency: 3.16
+          dependency: 3.20

       - v1.29:
           from:
           build_args:
       - v1.29:
           from:
           build_args:


@@ -212,20 +224,8 @@
           branch: stable/v1.28
           node: v1.28
           dependency: 3.16
           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
+- _functest-kubernetes-jobs: &functest-kubernetes-jobs

     name: 'functest-kubernetes-jobs'
     current-parameters: true
 
     name: 'functest-kubernetes-jobs'
     current-parameters: true
 


@@ -249,7 +249,7 @@
           name: DEPLOY_SCENARIO
           default: k8-nosdn-nofeature-noha
 
           name: DEPLOY_SCENARIO
           default: k8-nosdn-nofeature-noha
 

-- functest-kubernetes-run-containers: &functest-kubernetes-run-containers
+- _functest-kubernetes-run-containers: &functest-kubernetes-run-containers

     name: 'functest-kubernetes-run-containers'
     <<: *functest-kubernetes-containers
     privileged: '{privileged}'
     name: 'functest-kubernetes-run-containers'
     <<: *functest-kubernetes-containers
     privileged: '{privileged}'


@@ -853,6 +853,7 @@
               <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-cnf:{tag}
               <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-cnf:{tag}

+          execution-type: SEQUENTIALLY

           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-k8s_vims-run'
               <<: *functest-kubernetes-jobs
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-k8s_vims-run'
               <<: *functest-kubernetes-jobs


@@ -888,9 +889,9 @@
       - last-success
       - last-failure
       - last-duration
       - last-success
       - last-failure
       - last-duration

-    regex: ^functest-kubernetes-[a-z0-9.-]+-daily$
+    regex: ^functest-kubernetes-[a-z0-9.]+-daily$

 
 

-- functest-kubernetes-build-containers: &functest-kubernetes-build-containers
+- _functest-kubernetes-build-containers: &functest-kubernetes-build-containers

     name: 'functest-kubernetes-build-containers'
     <<: *functest-kubernetes-containers
     ref_arg: '{ref_arg}'
     name: 'functest-kubernetes-build-containers'
     <<: *functest-kubernetes-containers
     ref_arg: '{ref_arg}'


@@ -935,7 +936,7 @@
           branches:
             - '{ref}'
 
           branches:
             - '{ref}'
 

-- functest-kubernetes-dep: &functest-kubernetes-dep
+- _functest-kubernetes-dep: &functest-kubernetes-dep

     name: 'functest-kubernetes-containers'
     repo: '{repo}'
     container: '{container}'
     name: 'functest-kubernetes-containers'
     repo: '{repo}'
     container: '{container}'


@@ -951,22 +952,22 @@
       - functest-kubernetes-pull-containers:
           <<: *functest-kubernetes-dep
 
       - functest-kubernetes-pull-containers:
           <<: *functest-kubernetes-dep
 

-- functest-kubernetes-dep-params: &functest-kubernetes-dep-params
+- _functest-kubernetes-dep-params: &functest-kubernetes-dep-params

     name: 'functest-kubernetes-dep-params'
     repo: '_'
     container: 'alpine'
     port:
     tag:
       - latest:
     name: 'functest-kubernetes-dep-params'
     repo: '_'
     container: 'alpine'
     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.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'
 
 - project:
     name: 'functest-kubernetes-dep-pull'


@@ -1004,6 +1005,8 @@
           DEBIAN_FRONTEND=noninteractive apt-get \
             -o DPkg::Lock::Timeout=300 install \
             libxml2-dev libxslt-dev libffi-dev libjpeg-dev \
           DEBIAN_FRONTEND=noninteractive apt-get \
             -o DPkg::Lock::Timeout=300 install \
             libxml2-dev libxslt-dev libffi-dev libjpeg-dev \

+            python3.12 python3.12-dev python3.12-distutils \
+            python3.11 python3.11-dev python3.11-distutils \

             python3.10 python3.10-dev python3.10-distutils \
             python3.9 python3.9-dev python3.9-distutils \
             python3.8 python3.8-dev python3.8-distutils \
             python3.10 python3.10-dev python3.10-distutils \
             python3.9 python3.9-dev python3.9-distutils \
             python3.8 python3.8-dev python3.8-distutils \


@@ -1327,6 +1330,7 @@
               <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-cnf:{tag}
               <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-cnf:{tag}

+          execution-type: SEQUENTIALLY

           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-k8s_vims-run'
               <<: *functest-kubernetes-jobs
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-k8s_vims-run'
               <<: *functest-kubernetes-jobs


@@ -1357,7 +1361,7 @@
       - last-success
       - last-failure
       - last-duration
       - last-success
       - last-failure
       - last-duration

-    regex: ^functest-kubernetes-[a-z0-9.-]+-review$
+    regex: ^functest-kubernetes-[a-z0-9.]+-review$

 
 - view:
     name: functest-kubernetes-tox
 
 - view:
     name: functest-kubernetes-tox


@@ -1369,7 +1373,7 @@
       - last-success
       - last-failure
       - last-duration
       - last-success
       - last-failure
       - last-duration

-    regex: ^functest-kubernetes-[a-z0-9.-]+-tox$
+    regex: ^functest-kubernetes-[a-z0-9.]+-tox$

 
 - builder:
     name: functest-kubernetes-push-containers
 
 - builder:
     name: functest-kubernetes-push-containers


@@ -2159,7 +2163,7 @@
       - last-success
       - last-failure
       - last-duration
       - last-success
       - last-failure
       - last-duration

-    regex: ^functest-kubernetes-[a-z0-9.-]+-docker$
+    regex: ^functest-kubernetes-[a-z0-9.]+-docker$

 
 - view:
     name: functest-kubernetes-trivy
 
 - view:
     name: functest-kubernetes-trivy

diff --git a/jjb/functest/functest-pi.yaml b/jjb/functest/functest-pi.yaml
index 1ac14f5..37de8d2 100644 (file)
--- a/jjb/functest/functest-pi.yaml
+++ b/jjb/functest/functest-pi.yaml
@@ -1,12 +1,12 @@
 ---
 ---

-- functest-pi-containers: &functest-pi-containers
+- _functest-pi-containers: &functest-pi-containers

     name: 'functest-pi-containers'
     repo: '{repo}'
     port: '{port}'
     container: '{container}'
     tag: '{tag}'
 
     name: 'functest-pi-containers'
     repo: '{repo}'
     port: '{port}'
     container: '{container}'
     tag: '{tag}'
 

-- functest-pi-params: &functest-pi-params
+- _functest-pi-params: &functest-pi-params

     name: 'functest-pi-params'
     tag:
       - latest:
     name: 'functest-pi-params'
     tag:
       - latest:


@@ -55,7 +55,7 @@
           node: lf-virtual6
           DASHBOARD_URL: http://172.30.13.91
 
           node: lf-virtual6
           DASHBOARD_URL: http://172.30.13.91
 

-- functest-pi-ollivier-functest-healthcheck-params: &functest-pi-ollivier-functest-healthcheck-params
+- _functest-pi-ollivier-functest-healthcheck-params: &functest-pi-ollivier-functest-healthcheck-params

     name: 'functest-pi-ollivier-functest-healthcheck-params'
     repo: 'ollivier'
     container: 'functest-healthcheck'
     name: 'functest-pi-ollivier-functest-healthcheck-params'
     repo: 'ollivier'
     container: 'functest-healthcheck'


@@ -107,7 +107,7 @@
           node: lf-virtual6
           DASHBOARD_URL: http://172.30.13.91
 
           node: lf-virtual6
           DASHBOARD_URL: http://172.30.13.91
 

-- functest-pi-ollivier-functest-smoke-params: &functest-pi-ollivier-functest-smoke-params
+- _functest-pi-ollivier-functest-smoke-params: &functest-pi-ollivier-functest-smoke-params

     name: 'functest-pi-ollivier-functest-smoke-params'
     repo: 'ollivier'
     container: 'functest-smoke'
     name: 'functest-pi-ollivier-functest-smoke-params'
     repo: 'ollivier'
     container: 'functest-smoke'


@@ -159,7 +159,7 @@
           node: lf-virtual6
           DASHBOARD_URL: http://172.30.13.91
 
           node: lf-virtual6
           DASHBOARD_URL: http://172.30.13.91
 

-- functest-pi-ollivier-functest-smoke-cntt-params: &functest-pi-ollivier-functest-smoke-cntt-params
+- _functest-pi-ollivier-functest-smoke-cntt-params: &functest-pi-ollivier-functest-smoke-cntt-params

     name: 'functest-pi-ollivier-functest-smoke-cntt-params'
     repo: 'ollivier'
     container: 'functest-smoke-cntt'
     name: 'functest-pi-ollivier-functest-smoke-cntt-params'
     repo: 'ollivier'
     container: 'functest-smoke-cntt'


@@ -211,7 +211,7 @@
           node: lf-virtual6
           DASHBOARD_URL: http://172.30.13.91
 
           node: lf-virtual6
           DASHBOARD_URL: http://172.30.13.91
 

-- functest-pi-ollivier-functest-benchmarking-params: &functest-pi-ollivier-functest-benchmarking-params
+- _functest-pi-ollivier-functest-benchmarking-params: &functest-pi-ollivier-functest-benchmarking-params

     name: 'functest-pi-ollivier-functest-benchmarking-params'
     repo: 'ollivier'
     container: 'functest-benchmarking'
     name: 'functest-pi-ollivier-functest-benchmarking-params'
     repo: 'ollivier'
     container: 'functest-benchmarking'


@@ -263,7 +263,7 @@
           node: lf-virtual6
           DASHBOARD_URL: http://172.30.13.91
 
           node: lf-virtual6
           DASHBOARD_URL: http://172.30.13.91
 

-- functest-pi-ollivier-functest-benchmarking-cntt-params: &functest-pi-ollivier-functest-benchmarking-cntt-params
+- _functest-pi-ollivier-functest-benchmarking-cntt-params: &functest-pi-ollivier-functest-benchmarking-cntt-params

     name: 'functest-pi-ollivier-functest-benchmarking-cntt-params'
     repo: 'ollivier'
     container: 'functest-benchmarking-cntt'
     name: 'functest-pi-ollivier-functest-benchmarking-cntt-params'
     repo: 'ollivier'
     container: 'functest-benchmarking-cntt'


@@ -315,7 +315,7 @@
           node: lf-virtual6
           DASHBOARD_URL: http://172.30.13.91
 
           node: lf-virtual6
           DASHBOARD_URL: http://172.30.13.91
 

-- functest-pi-ollivier-functest-vnf-params: &functest-pi-ollivier-functest-vnf-params
+- _functest-pi-ollivier-functest-vnf-params: &functest-pi-ollivier-functest-vnf-params

     name: 'functest-pi-ollivier-functest-vnf-params'
     repo: 'ollivier'
     container: 'functest-vnf'
     name: 'functest-pi-ollivier-functest-vnf-params'
     repo: 'ollivier'
     container: 'functest-vnf'


@@ -367,7 +367,7 @@
           node: lf-virtual6
           DASHBOARD_URL: http://172.30.13.91
 
           node: lf-virtual6
           DASHBOARD_URL: http://172.30.13.91
 

-- functest-pi-jobs: &functest-pi-jobs
+- _functest-pi-jobs: &functest-pi-jobs

     name: 'functest-pi-jobs'
     current-parameters: true
 
     name: 'functest-pi-jobs'
     current-parameters: true
 


@@ -405,7 +405,7 @@
           name: IMAGE_PROPERTIES
           default: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
 
           name: IMAGE_PROPERTIES
           default: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
 

-- functest-pi-run-containers: &functest-pi-run-containers
+- _functest-pi-run-containers: &functest-pi-run-containers

     name: 'functest-pi-run-containers'
     <<: *functest-pi-containers
     privileged: '{privileged}'
     name: 'functest-pi-run-containers'
     <<: *functest-pi-containers
     privileged: '{privileged}'

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 463dd9a..f001a37 100644 (file)
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -1,12 +1,12 @@
 ---
 ---

-- functest-containers: &functest-containers
+- _functest-containers: &functest-containers

     name: 'functest-containers'
     repo: '{repo}'
     port: '{port}'
     container: '{container}'
     tag: '{tag}'
 
     name: 'functest-containers'
     repo: '{repo}'
     port: '{port}'
     container: '{container}'
     tag: '{tag}'
 

-- functest-params: &functest-params
+- _functest-params: &functest-params

     name: 'functest-params'
     tag:
       - latest:
     name: 'functest-params'
     tag:
       - latest:


@@ -45,7 +45,7 @@
           DASHBOARD_URL: http://172.30.13.91
           dependency: 3.13
 
           DASHBOARD_URL: http://172.30.13.91
           dependency: 3.13
 

-- functest-opnfv-functest-healthcheck-params: &functest-opnfv-functest-healthcheck-params
+- _functest-opnfv-functest-healthcheck-params: &functest-opnfv-functest-healthcheck-params

     name: 'functest-opnfv-functest-healthcheck-params'
     repo: 'opnfv'
     container: 'functest-healthcheck'
     name: 'functest-opnfv-functest-healthcheck-params'
     repo: 'opnfv'
     container: 'functest-healthcheck'


@@ -87,7 +87,7 @@
           DASHBOARD_URL: http://172.30.13.91
           dependency: 3.13
 
           DASHBOARD_URL: http://172.30.13.91
           dependency: 3.13
 

-- functest-opnfv-functest-smoke-params: &functest-opnfv-functest-smoke-params
+- _functest-opnfv-functest-smoke-params: &functest-opnfv-functest-smoke-params

     name: 'functest-opnfv-functest-smoke-params'
     repo: 'opnfv'
     container: 'functest-smoke'
     name: 'functest-opnfv-functest-smoke-params'
     repo: 'opnfv'
     container: 'functest-smoke'


@@ -129,7 +129,7 @@
           DASHBOARD_URL: http://172.30.13.91
           dependency: 3.13
 
           DASHBOARD_URL: http://172.30.13.91
           dependency: 3.13
 

-- functest-opnfv-functest-smoke-cntt-params: &functest-opnfv-functest-smoke-cntt-params
+- _functest-opnfv-functest-smoke-cntt-params: &functest-opnfv-functest-smoke-cntt-params

     name: 'functest-opnfv-functest-smoke-cntt-params'
     repo: 'opnfv'
     container: 'functest-smoke-cntt'
     name: 'functest-opnfv-functest-smoke-cntt-params'
     repo: 'opnfv'
     container: 'functest-smoke-cntt'


@@ -171,7 +171,7 @@
           DASHBOARD_URL: http://172.30.13.91
           dependency: 3.13
 
           DASHBOARD_URL: http://172.30.13.91
           dependency: 3.13
 

-- functest-opnfv-functest-benchmarking-params: &functest-opnfv-functest-benchmarking-params
+- _functest-opnfv-functest-benchmarking-params: &functest-opnfv-functest-benchmarking-params

     name: 'functest-opnfv-functest-benchmarking-params'
     repo: 'opnfv'
     container: 'functest-benchmarking'
     name: 'functest-opnfv-functest-benchmarking-params'
     repo: 'opnfv'
     container: 'functest-benchmarking'


@@ -213,7 +213,7 @@
           DASHBOARD_URL: http://172.30.13.91
           dependency: 3.13
 
           DASHBOARD_URL: http://172.30.13.91
           dependency: 3.13
 

-- functest-opnfv-functest-benchmarking-cntt-params: &functest-opnfv-functest-benchmarking-cntt-params
+- _functest-opnfv-functest-benchmarking-cntt-params: &functest-opnfv-functest-benchmarking-cntt-params

     name: 'functest-opnfv-functest-benchmarking-cntt-params'
     repo: 'opnfv'
     container: 'functest-benchmarking-cntt'
     name: 'functest-opnfv-functest-benchmarking-cntt-params'
     repo: 'opnfv'
     container: 'functest-benchmarking-cntt'


@@ -255,7 +255,7 @@
           DASHBOARD_URL: http://172.30.13.91
           dependency: 3.13
 
           DASHBOARD_URL: http://172.30.13.91
           dependency: 3.13
 

-- functest-opnfv-functest-vnf-params: &functest-opnfv-functest-vnf-params
+- _functest-opnfv-functest-vnf-params: &functest-opnfv-functest-vnf-params

     name: 'functest-opnfv-functest-vnf-params'
     repo: 'opnfv'
     container: 'functest-vnf'
     name: 'functest-opnfv-functest-vnf-params'
     repo: 'opnfv'
     container: 'functest-vnf'


@@ -297,7 +297,7 @@
           DASHBOARD_URL: http://172.30.13.91
           dependency: 3.13
 
           DASHBOARD_URL: http://172.30.13.91
           dependency: 3.13
 

-- functest-jobs: &functest-jobs
+- _functest-jobs: &functest-jobs

     name: 'functest-jobs'
     current-parameters: true
 
     name: 'functest-jobs'
     current-parameters: true
 


@@ -335,7 +335,7 @@
           name: IMAGE_PROPERTIES
           default: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
 
           name: IMAGE_PROPERTIES
           default: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
 

-- functest-run-containers: &functest-run-containers
+- _functest-run-containers: &functest-run-containers

     name: 'functest-run-containers'
     <<: *functest-containers
     privileged: '{privileged}'
     name: 'functest-run-containers'
     <<: *functest-containers
     privileged: '{privileged}'


@@ -1166,9 +1166,9 @@
       - last-success
       - last-failure
       - last-duration
       - last-success
       - last-failure
       - last-duration

-    regex: ^functest-[a-z0-9.-]+-daily$
+    regex: ^functest-[a-z0-9.]+-daily$

 
 

-- functest-build-containers: &functest-build-containers
+- _functest-build-containers: &functest-build-containers

     name: 'functest-build-containers'
     <<: *functest-containers
     ref_arg: '{ref_arg}'
     name: 'functest-build-containers'
     <<: *functest-containers
     ref_arg: '{ref_arg}'


@@ -1213,7 +1213,7 @@
           branches:
             - '{ref}'
 
           branches:
             - '{ref}'
 

-- functest-dep: &functest-dep
+- _functest-dep: &functest-dep

     name: 'functest-containers'
     repo: '{repo}'
     container: '{container}'
     name: 'functest-containers'
     repo: '{repo}'
     container: '{container}'


@@ -1229,7 +1229,7 @@
       - functest-pull-containers:
           <<: *functest-dep
 
       - functest-pull-containers:
           <<: *functest-dep
 

-- functest-dep-params: &functest-dep-params
+- _functest-dep-params: &functest-dep-params

     name: 'functest-dep-params'
     repo: '_'
     container: 'alpine'
     name: 'functest-dep-params'
     repo: '_'
     container: 'alpine'


@@ -1282,6 +1282,8 @@
           sudo DEBIAN_FRONTEND=noninteractive apt-get \
             -o DPkg::Lock::Timeout=300 install \
             libxml2-dev libxslt-dev libffi-dev libjpeg-dev \
           sudo DEBIAN_FRONTEND=noninteractive apt-get \
             -o DPkg::Lock::Timeout=300 install \
             libxml2-dev libxslt-dev libffi-dev libjpeg-dev \

+            python3.12 python3.12-dev python3.12-distutils \
+            python3.11 python3.11-dev python3.11-distutils \

             python3.10 python3.10-dev python3.10-distutils \
             python3.9 python3.9-dev python3.9-distutils \
             python3.8 python3.8-dev python3.8-distutils \
             python3.10 python3.10-dev python3.10-distutils \
             python3.9 python3.9-dev python3.9-distutils \
             python3.8 python3.8-dev python3.8-distutils \


@@ -1717,7 +1719,7 @@
       - last-success
       - last-failure
       - last-duration
       - last-success
       - last-failure
       - last-duration

-    regex: ^functest-[a-z0-9.-]+-review$
+    regex: ^functest-[a-z0-9.]+-review$

 
 - view:
     name: functest-tox
 
 - view:
     name: functest-tox


@@ -1729,7 +1731,7 @@
       - last-success
       - last-failure
       - last-duration
       - last-success
       - last-failure
       - last-duration

-    regex: ^functest-[a-z0-9.-]+-tox$
+    regex: ^functest-[a-z0-9.]+-tox$

 
 - builder:
     name: functest-push-containers
 
 - builder:
     name: functest-push-containers


@@ -2624,7 +2626,7 @@
       - last-success
       - last-failure
       - last-duration
       - last-success
       - last-failure
       - last-duration

-    regex: ^functest-[a-z0-9.-]+-docker$
+    regex: ^functest-[a-z0-9.]+-docker$

 
 - view:
     name: functest-trivy
 
 - view:
     name: functest-trivy

diff --git a/jjb/functest/xtesting-ci-vm.yaml b/jjb/functest/xtesting-ci-vm.yaml
index 367598f..7c5f602 100644 (file)
--- a/jjb/functest/xtesting-ci-vm.yaml
+++ b/jjb/functest/xtesting-ci-vm.yaml
@@ -80,6 +80,9 @@
       - latest:
           ref: master
           role-version: master
       - latest:
           ref: master
           role-version: master

+      - '2024.1':
+          ref: stable/2024.1
+          role-version: master

       - '2023.2':
           ref: stable/2023.2
           role-version: master
       - '2023.2':
           ref: stable/2023.2
           role-version: master


@@ -129,6 +132,12 @@
           ref: stable/v1.22
           role-version: master
     exclude:
           ref: stable/v1.22
           role-version: master
     exclude:

+      - project: xtestingci
+        version: '2024.1'
+      - project: functest
+        version: '2024.1'
+      - project: functest-kubernetes
+        version: '2024.1'

       - project: xtestingci
         version: '2023.2'
       - project: functest
       - project: xtestingci
         version: '2023.2'
       - project: functest

diff --git a/jjb/functest/xtesting-ci.yaml b/jjb/functest/xtesting-ci.yaml
index 9969d53..e02747a 100644 (file)
--- a/jjb/functest/xtesting-ci.yaml
+++ b/jjb/functest/xtesting-ci.yaml
@@ -114,7 +114,7 @@
           playbook: '{playbook}'
           release: '{release}'
 
           playbook: '{playbook}'
           release: '{release}'
 

-- playbook: &playbook
+- _playbook: &playbook

     name: 'playbook'
     playbook:
       - all
     name: 'playbook'
     playbook:
       - all

diff --git a/jjb/functest/xtesting-pi.yaml b/jjb/functest/xtesting-pi.yaml
index 86ac98f..79217bd 100644 (file)
--- a/jjb/functest/xtesting-pi.yaml
+++ b/jjb/functest/xtesting-pi.yaml
@@ -1,16 +1,18 @@
 ---
 ---

-- xtesting-pi-containers: &xtesting-pi-containers
+- _xtesting-pi-containers: &xtesting-pi-containers

     name: 'xtesting-pi-containers'
     repo: '{repo}'
     port: '{port}'
     container: '{container}'
     tag: '{tag}'
 
     name: 'xtesting-pi-containers'
     repo: '{repo}'
     port: '{port}'
     container: '{container}'
     tag: '{tag}'
 

-- xtesting-pi-params: &xtesting-pi-params
+- _xtesting-pi-params: &xtesting-pi-params

     name: 'xtesting-pi-params'
     tag:
       - latest:
           node: opnfv-build
     name: 'xtesting-pi-params'
     tag:
       - latest:
           node: opnfv-build

+      - 2024.1:
+          node: opnfv-build

       - 2023.2:
           node: opnfv-build
       - 2023.1:
       - 2023.2:
           node: opnfv-build
       - 2023.1:


@@ -52,7 +54,7 @@
       - arm64-wallaby:
           node: opnfv-build
 
       - arm64-wallaby:
           node: opnfv-build
 

-- xtesting-pi-ollivier-xtesting-params: &xtesting-pi-ollivier-xtesting-params
+- _xtesting-pi-ollivier-xtesting-params: &xtesting-pi-ollivier-xtesting-params

     name: 'xtesting-pi-ollivier-xtesting-params'
     repo: 'ollivier'
     container: 'xtesting'
     name: 'xtesting-pi-ollivier-xtesting-params'
     repo: 'ollivier'
     container: 'xtesting'


@@ -60,6 +62,8 @@
     tag:
       - latest:
           node: opnfv-build
     tag:
       - latest:
           node: opnfv-build

+      - 2024.1:
+          node: opnfv-build

       - 2023.2:
           node: opnfv-build
       - 2023.1:
       - 2023.2:
           node: opnfv-build
       - 2023.1:


@@ -101,7 +105,7 @@
       - arm64-wallaby:
           node: opnfv-build
 
       - arm64-wallaby:
           node: opnfv-build
 

-- xtesting-pi-jobs: &xtesting-pi-jobs
+- _xtesting-pi-jobs: &xtesting-pi-jobs

     name: 'xtesting-pi-jobs'
     current-parameters: true
 
     name: 'xtesting-pi-jobs'
     current-parameters: true
 


@@ -118,7 +122,7 @@
       - random-string:
           name: build_tag
 
       - random-string:
           name: build_tag
 

-- xtesting-pi-run-containers: &xtesting-pi-run-containers
+- _xtesting-pi-run-containers: &xtesting-pi-run-containers

     name: 'xtesting-pi-run-containers'
     <<: *xtesting-pi-containers
     privileged: '{privileged}'
     name: 'xtesting-pi-run-containers'
     <<: *xtesting-pi-containers
     privileged: '{privileged}'

diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index fbd8ba4..b3b2871 100644 (file)
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -1,12 +1,12 @@
 ---
 ---

-- xtesting-containers: &xtesting-containers
+- _xtesting-containers: &xtesting-containers

     name: 'xtesting-containers'
     repo: '{repo}'
     port: '{port}'
     container: '{container}'
     tag: '{tag}'
 
     name: 'xtesting-containers'
     repo: '{repo}'
     port: '{port}'
     container: '{container}'
     tag: '{tag}'
 

-- xtesting-params: &xtesting-params
+- _xtesting-params: &xtesting-params

     name: 'xtesting-params'
     tag:
       - latest:
     name: 'xtesting-params'
     tag:
       - latest:


@@ -14,7 +14,13 @@
           build_args:
           branch: master
           node: opnfv-build
           build_args:
           branch: master
           node: opnfv-build

-          dependency: 3.17
+          dependency: 3.20
+      - 2024.1:
+          from:
+          build_args:
+          branch: stable/2024.1
+          node: opnfv-build
+          dependency: 3.20

       - 2023.2:
           from:
           build_args:
       - 2023.2:
           from:
           build_args:


@@ -52,7 +58,7 @@
           node: opnfv-build
           dependency: 3.13
 
           node: opnfv-build
           dependency: 3.13
 

-- xtesting-opnfv-xtesting-params: &xtesting-opnfv-xtesting-params
+- _xtesting-opnfv-xtesting-params: &xtesting-opnfv-xtesting-params

     name: 'xtesting-opnfv-xtesting-params'
     repo: 'opnfv'
     container: 'xtesting'
     name: 'xtesting-opnfv-xtesting-params'
     repo: 'opnfv'
     container: 'xtesting'


@@ -63,7 +69,13 @@
           build_args:
           branch: master
           node: opnfv-build
           build_args:
           branch: master
           node: opnfv-build

-          dependency: 3.17
+          dependency: 3.20
+      - 2024.1:
+          from:
+          build_args:
+          branch: stable/2024.1
+          node: opnfv-build
+          dependency: 3.20

       - 2023.2:
           from:
           build_args:
       - 2023.2:
           from:
           build_args:


@@ -101,7 +113,7 @@
           node: opnfv-build
           dependency: 3.13
 
           node: opnfv-build
           dependency: 3.13
 

-- xtesting-jobs: &xtesting-jobs
+- _xtesting-jobs: &xtesting-jobs

     name: 'xtesting-jobs'
     current-parameters: true
 
     name: 'xtesting-jobs'
     current-parameters: true
 


@@ -118,7 +130,7 @@
       - random-string:
           name: build_tag
 
       - random-string:
           name: build_tag
 

-- xtesting-run-containers: &xtesting-run-containers
+- _xtesting-run-containers: &xtesting-run-containers

     name: 'xtesting-run-containers'
     <<: *xtesting-containers
     privileged: '{privileged}'
     name: 'xtesting-run-containers'
     <<: *xtesting-containers
     privileged: '{privileged}'


@@ -422,9 +434,9 @@
       - last-success
       - last-failure
       - last-duration
       - last-success
       - last-failure
       - last-duration

-    regex: ^xtesting-[a-z0-9.-]+-daily$
+    regex: ^xtesting-[a-z0-9.]+-daily$

 
 

-- xtesting-build-containers: &xtesting-build-containers
+- _xtesting-build-containers: &xtesting-build-containers

     name: 'xtesting-build-containers'
     <<: *xtesting-containers
     ref_arg: '{ref_arg}'
     name: 'xtesting-build-containers'
     <<: *xtesting-containers
     ref_arg: '{ref_arg}'


@@ -469,7 +481,7 @@
           branches:
             - '{ref}'
 
           branches:
             - '{ref}'
 

-- xtesting-dep: &xtesting-dep
+- _xtesting-dep: &xtesting-dep

     name: 'xtesting-containers'
     repo: '{repo}'
     container: '{container}'
     name: 'xtesting-containers'
     repo: '{repo}'
     container: '{container}'


@@ -485,14 +497,16 @@
       - xtesting-pull-containers:
           <<: *xtesting-dep
 
       - xtesting-pull-containers:
           <<: *xtesting-dep
 

-- xtesting-dep-params: &xtesting-dep-params
+- _xtesting-dep-params: &xtesting-dep-params

     name: 'xtesting-dep-params'
     repo: '_'
     container: 'alpine'
     port:
     tag:
       - latest:
     name: 'xtesting-dep-params'
     repo: '_'
     container: 'alpine'
     port:
     tag:
       - latest:

-          dependency: 3.17
+          dependency: 3.20
+      - 2024.1:
+          dependency: 3.20

       - 2023.2:
           dependency: 3.17
       - 2023.1:
       - 2023.2:
           dependency: 3.17
       - 2023.1:


@@ -542,6 +556,8 @@
           sudo DEBIAN_FRONTEND=noninteractive apt-get \
             -o DPkg::Lock::Timeout=300 install \
             libxml2-dev libxslt-dev libffi-dev libjpeg-dev \
           sudo DEBIAN_FRONTEND=noninteractive apt-get \
             -o DPkg::Lock::Timeout=300 install \
             libxml2-dev libxslt-dev libffi-dev libjpeg-dev \

+            python3.12 python3.12-dev python3.12-distutils \
+            python3.11 python3.11-dev python3.11-distutils \

             python3.10 python3.10-dev python3.10-distutils \
             python3.9 python3.9-dev python3.9-distutils \
             python3.8 python3.8-dev python3.8-distutils \
             python3.10 python3.10-dev python3.10-distutils \
             python3.9 python3.9-dev python3.9-distutils \
             python3.8 python3.8-dev python3.8-distutils \


@@ -694,7 +710,7 @@
       - last-success
       - last-failure
       - last-duration
       - last-success
       - last-failure
       - last-duration

-    regex: ^xtesting-[a-z0-9.-]+-review$
+    regex: ^xtesting-[a-z0-9.]+-review$

 
 - view:
     name: xtesting-tox
 
 - view:
     name: xtesting-tox


@@ -706,7 +722,7 @@
       - last-success
       - last-failure
       - last-duration
       - last-success
       - last-failure
       - last-duration

-    regex: ^xtesting-[a-z0-9.-]+-tox$
+    regex: ^xtesting-[a-z0-9.]+-tox$

 
 - builder:
     name: xtesting-push-containers
 
 - builder:
     name: xtesting-push-containers


@@ -947,7 +963,7 @@
       - last-success
       - last-failure
       - last-duration
       - last-success
       - last-failure
       - last-duration

-    regex: ^xtesting-[a-z0-9.-]+-docker$
+    regex: ^xtesting-[a-z0-9.]+-docker$

 
 - view:
     name: xtesting-trivy
 
 - view:
     name: xtesting-trivy

diff --git a/jjb/releng/releng-jobs.yaml b/jjb/releng/releng-jobs.yaml
index 331aed8..f4eda89 100644 (file)
--- a/jjb/releng/releng-jobs.yaml
+++ b/jjb/releng/releng-jobs.yaml
@@ -193,12 +193,15 @@
       - v1.27
       - v1.28
       - v1.29
       - v1.27
       - v1.28
       - v1.29

+      - v1.30
+      - v1.31

       - xena
       - wallaby
       - yoga
       - zed
       - '2023.1'
       - '2023.2'
       - xena
       - wallaby
       - yoga
       - zed
       - '2023.1'
       - '2023.2'

+      - '2024.1'

     jobs:
       - 'releng-release-{stream}-verify'
       - 'releng-release-{stream}-merge'
     jobs:
       - 'releng-release-{stream}-verify'
       - 'releng-release-{stream}-merge'

diff --git a/releases/2024.1/functest.yaml b/releases/2024.1/functest.yaml
new file mode 100644 (file)
index 0000000..6c71d1a
--- /dev/null
+++ b/releases/2024.1/functest.yaml
@@ -0,0 +1,9 @@
+---
+project: functest
+project-type: testing
+release-model: stable
+
+branches:
+  - name: stable/2024.1
+    location:
+      functest-xtesting: e8c1a3da8d98f09a1b455d6eebe17c1345e7bfbc

diff --git a/releases/pieman/opnfvdocs.yaml b/releases/pieman/opnfvdocs.yaml
new file mode 100644 (file)
index 0000000..cc32727
--- /dev/null
+++ b/releases/pieman/opnfvdocs.yaml
@@ -0,0 +1,9 @@
+---
+project: opnfvdocs
+project-type: infra
+release-model: stable
+
+branches:
+  - name: stable/pieman
+    location:
+      opnfvdocs: fc7cdf4af32a4ea6ffb0e1719650d8bb4e460185

diff --git a/releases/v1.30/functest.yaml b/releases/v1.30/functest.yaml
new file mode 100644 (file)
index 0000000..7ff95bc
--- /dev/null
+++ b/releases/v1.30/functest.yaml
@@ -0,0 +1,9 @@
+---
+project: functest
+project-type: testing
+release-model: stable
+
+branches:
+  - name: stable/v1.30
+    location:
+      functest-kubernetes: c4de3877ca0ff53820fb8019f1cea067969f16ad

diff --git a/releases/v1.31/functest.yaml b/releases/v1.31/functest.yaml
new file mode 100644 (file)
index 0000000..3fb10b7
--- /dev/null
+++ b/releases/v1.31/functest.yaml
@@ -0,0 +1,9 @@
+---
+project: functest
+project-type: testing
+release-model: stable
+
+branches:
+  - name: stable/v1.31
+    location:
+      functest-kubernetes: c4de3877ca0ff53820fb8019f1cea067969f16ad

diff --git a/tox.ini b/tox.ini
index 23f7c1a..914fd7b 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -8,16 +8,16 @@ envlist = jjb,docs
 skipsdist = True
 
 [testenv]
 skipsdist = True
 
 [testenv]

-basepython = python3.10
+basepython = python3.12

 usedevelop = False
 deps =
 usedevelop = False
 deps =

-  -chttps://opendev.org/openstack/requirements/raw/branch/stable/zed/upper-constraints.txt
+  -chttps://opendev.org/openstack/requirements/raw/branch/stable/2024.1/upper-constraints.txt

   -cupper-constraints.txt
   -r{toxinidir}/test-requirements.txt
 
 [testenv:jjb]
 commands=
   -cupper-constraints.txt
   -r{toxinidir}/test-requirements.txt
 
 [testenv:jjb]
 commands=

-  jenkins-jobs test -o {envtmpdir}/job_output -r {toxinidir}/jjb
+  jenkins-jobs --allow-empty-variables test -o {envtmpdir}/job_output -r {toxinidir}/jjb

 
 [testenv:docs]
 commands =
 
 [testenv:docs]
 commands =

diff --git a/upper-constraints.txt b/upper-constraints.txt
index b6d6780..fe70615 100644 (file)
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -1,7 +1,6 @@
 sphinxcontrib-needs===0.7.9
 sphinxcontrib-needs===0.7.9

-sphinxcontrib.plantuml===0.24
-sphinx_toolbox==3.2.0
-sphinxcontrib.nwdiag===2.0.0
+sphinxcontrib.plantuml===0.30
+sphinx-toolbox==3.8.0

 sphinxcontrib-swaggerdoc===0.1.7
 sphinxcontrib-swaggerdoc===0.1.7

-sphinx-rtd-theme===1.0.0
-jenkins-job-builder===4.3.0
+sphinx-rtd-theme===3.0.0rc1
+jenkins-job-builder===6.4.1