Merge "Clean also any Jenkins or Gitlab cluster"

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

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 59b64e6..f463a78 100644 (file)
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -15,6 +15,12 @@
           from:
           buildargs:
           branch: master
+          slave: lf-virtual1-7
+          dependency: 3.13
+      - v1.21:
+          from:
+          buildargs:
+          branch: stable/v1.21
           slave: lf-virtual1-6
           dependency: 3.13
       - leguer:
@@ -29,24 +35,6 @@
           branch: stable/kali
           slave: lf-virtual1-4
           dependency: 3.11
-      - jerma:
-          from:
-          buildargs:
-          branch: stable/jerma
-          slave: lf-virtual1-3
-          dependency: 3.10
-      - iruya:
-          from:
-          buildargs:
-          branch: stable/iruya
-          slave: lf-virtual1-2
-          dependency: 3.9
-      - hunter:
-          from:
-          buildargs:
-          branch: stable/hunter
-          slave: lf-virtual1-1
-          dependency: 3.9
 
 - functest-kubernetes-jobs: &functest-kubernetes-jobs
     name: 'functest-kubernetes-jobs'
@@ -277,57 +265,7 @@
     network: bridge
     exclude:
       - {'tag': 'latest', 'test': 'k8s_io'}
-      - {'tag': 'jerma', 'test': 'k8s_io'}
-      - {'tag': 'jerma', 'test': 'k8s_conformance_serial'}
-      - {'tag': 'jerma', 'test': 'sig_api_machinery'}
-      - {'tag': 'jerma', 'test': 'sig_api_machinery_serial'}
-      - {'tag': 'jerma', 'test': 'sig_apps'}
-      - {'tag': 'jerma', 'test': 'sig_apps_serial'}
-      - {'tag': 'jerma', 'test': 'sig_auth'}
-      - {'tag': 'jerma', 'test': 'sig_cli'}
-      - {'tag': 'jerma', 'test': 'sig_cli_serial'}
-      - {'tag': 'jerma', 'test': 'sig_cluster_lifecycle'}
-      - {'tag': 'jerma', 'test': 'sig_instrumentation'}
-      - {'tag': 'jerma', 'test': 'sig_network'}
-      - {'tag': 'jerma', 'test': 'sig_network_serial'}
-      - {'tag': 'jerma', 'test': 'sig_node'}
-      - {'tag': 'jerma', 'test': 'sig_scheduling_serial'}
-      - {'tag': 'jerma', 'test': 'sig_storage'}
-      - {'tag': 'jerma', 'test': 'sig_storage_serial'}
-      - {'tag': 'iruya', 'test': 'k8s_io'}
-      - {'tag': 'iruya', 'test': 'k8s_conformance_serial'}
-      - {'tag': 'iruya', 'test': 'sig_api_machinery'}
-      - {'tag': 'iruya', 'test': 'sig_api_machinery_serial'}
-      - {'tag': 'iruya', 'test': 'sig_apps'}
-      - {'tag': 'iruya', 'test': 'sig_apps_serial'}
-      - {'tag': 'iruya', 'test': 'sig_auth'}
-      - {'tag': 'iruya', 'test': 'sig_cli'}
-      - {'tag': 'iruya', 'test': 'sig_cli_serial'}
-      - {'tag': 'iruya', 'test': 'sig_cluster_lifecycle'}
-      - {'tag': 'iruya', 'test': 'sig_instrumentation'}
-      - {'tag': 'iruya', 'test': 'sig_network'}
-      - {'tag': 'iruya', 'test': 'sig_network_serial'}
-      - {'tag': 'iruya', 'test': 'sig_node'}
-      - {'tag': 'iruya', 'test': 'sig_scheduling_serial'}
-      - {'tag': 'iruya', 'test': 'sig_storage'}
-      - {'tag': 'iruya', 'test': 'sig_storage_serial'}
-      - {'tag': 'hunter', 'test': 'k8s_io'}
-      - {'tag': 'hunter', 'test': 'k8s_conformance_serial'}
-      - {'tag': 'hunter', 'test': 'sig_api_machinery'}
-      - {'tag': 'hunter', 'test': 'sig_api_machinery_serial'}
-      - {'tag': 'hunter', 'test': 'sig_apps'}
-      - {'tag': 'hunter', 'test': 'sig_apps_serial'}
-      - {'tag': 'hunter', 'test': 'sig_auth'}
-      - {'tag': 'hunter', 'test': 'sig_cli'}
-      - {'tag': 'hunter', 'test': 'sig_cli_serial'}
-      - {'tag': 'hunter', 'test': 'sig_cluster_lifecycle'}
-      - {'tag': 'hunter', 'test': 'sig_instrumentation'}
-      - {'tag': 'hunter', 'test': 'sig_network'}
-      - {'tag': 'hunter', 'test': 'sig_network_serial'}
-      - {'tag': 'hunter', 'test': 'sig_node'}
-      - {'tag': 'hunter', 'test': 'sig_scheduling_serial'}
-      - {'tag': 'hunter', 'test': 'sig_storage'}
-      - {'tag': 'hunter', 'test': 'sig_storage_serial'}
+      - {'tag': 'v1.21', 'test': 'k8s_io'}
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
 
@@ -350,6 +288,7 @@
     container: 'functest-kubernetes-benchmarking'
     test:
       - xrally_kubernetes_full
+      - netperf
     privileged: 'false'
     network: bridge
     jobs:
@@ -362,7 +301,7 @@
     test:
       - k8s_vims
       - helm_vims
-      - cnf_conformance
+      - cnf_testsuite
     privileged: 'false'
     network: bridge
     jobs:
@@ -430,9 +369,9 @@
     properties:
       - build-blocker:
           use-build-blocker: true
-          blocking-level: 'GLOBAL'
+          blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-kubernetes-*-(daily|docker|review)$'
+            - '^functest-kubernetes-{tag}-(daily|docker|review)$'
     builders:
       - multijob:
           name: remove former images
@@ -523,6 +462,8 @@
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-xrally_kubernetes_full-run'
               <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-netperf-run'
+              <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-cnf:{tag}
           projects:
@@ -530,7 +471,7 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-helm_vims-run'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-cnf_conformance-run'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-cnf_testsuite-run'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: dump all campaign data
@@ -803,9 +744,9 @@
     properties:
       - build-blocker:
           use-build-blocker: true
-          blocking-level: 'GLOBAL'
+          blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-kubernetes-*-(daily|docker|review)$'
+            - '^functest-kubernetes-{tag}-(daily|docker|review)$'
     builders:
       - multijob:
           name: remove former images
@@ -917,6 +858,8 @@
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-xrally_kubernetes_full-run'
               <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-netperf-run'
+              <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-cnf:{tag}
           projects:
@@ -924,7 +867,7 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-helm_vims-run'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-cnf_conformance-run'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-cnf_testsuite-run'
               <<: *functest-kubernetes-jobs
 
 - project:
@@ -1063,9 +1006,9 @@
     properties:
       - build-blocker:
           use-build-blocker: true
-          blocking-level: 'GLOBAL'
+          blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-kubernetes-*-(daily|docker|review)$'
+            - '^functest-kubernetes-{tag}-(daily|docker|review)$'
     builders:
       - multijob:
           name: remove dependency