Skip k8s_vims iruya gating

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

diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index 4df9eef..079580d 100644 (file)
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -196,6 +196,16 @@
     jobs:
       - 'functest-kubernetes-pi-{repo}-{container}-{tag}-pull'
 
+- project:
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-pull'
+    <<: *functest-kubernetes-pi-params
+    container: 'functest-kubernetes-benchmarking'
+    exclude:
+      - tag: arm-hunter
+      - tag: arm64-hunter
+    jobs:
+      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-pull'
+
 - project:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-pull'
     <<: *functest-kubernetes-pi-params
@@ -239,6 +249,16 @@
     jobs:
       - 'functest-kubernetes-pi-{repo}-{container}-{tag}-rmi'
 
+- project:
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-rmi'
+    <<: *functest-kubernetes-pi-params
+    container: 'functest-kubernetes-benchmarking'
+    exclude:
+      - tag: arm-hunter
+      - tag: arm64-hunter
+    jobs:
+      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-rmi'
+
 - project:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-rmi'
     <<: *functest-kubernetes-pi-params
@@ -261,32 +281,12 @@
       - functest-kubernetes-pi-run-containers:
           <<: *functest-kubernetes-pi-run-containers
 
-- job-template:
-    name: 'functest-kubernetes-pi-{repo}-functest-kubernetes-cnf-{tag}-k8s_vims-run'
-    properties:
-      - build-blocker:
-          use-build-blocker: true
-          blocking-level: 'GLOBAL'
-          blocking-jobs:
-            - '^functest-kubernetes(-pi)?-*-k8s_vims-run$'
-    parameters:
-      - functest-kubernetes-pi-slave:
-          slave: '{slave}'
-      - functest-kubernetes-pi-build_tag:
-          build_tag: ''
-      - functest-kubernetes-pi-DEPLOY_SCENARIO:
-          DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
-      - functest-kubernetes-pi-DEBUG:
-          DEBUG: 'true'
-    builders:
-      - functest-kubernetes-pi-run-containers:
-          <<: *functest-kubernetes-pi-run-containers
-
 - project:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck'
     <<: *functest-kubernetes-pi-params
     container: 'functest-kubernetes-healthcheck'
     test:
+      - k8s_quick
       - k8s_smoke
     exclude:
       - tag: arm-hunter
@@ -323,16 +323,38 @@
     jobs:
       - 'functest-kubernetes-pi-{repo}-{container}-{tag}-{test}-run'
 
+- project:
+    name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking'
+    <<: *functest-kubernetes-pi-params
+    container: 'functest-kubernetes-benchmarking'
+    test:
+      - xrally_kubernetes_full
+    exclude:
+      - tag: arm-hunter
+      - tag: arm64-hunter
+    privileged: 'false'
+    network: bridge
+    jobs:
+      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-{test}-run'
+
 - project:
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf'
     <<: *functest-kubernetes-pi-params
     container: 'functest-kubernetes-cnf'
     test:
+      - cnf_conformance
       - k8s_vims
+    exclude:
+      - tag: iruya
+        test: k8s_vims
+      - tag: arm-iruya
+        test: k8s_vims
+      - tag: arm64-iruya
+        test: k8s_vims
     privileged: 'false'
     network: bridge
     jobs:
-      - 'functest-kubernetes-pi-{repo}-functest-kubernetes-cnf-{tag}-k8s_vims-run'
+      - 'functest-kubernetes-pi-{repo}-{container}-{tag}-{test}-run'
 
 
 - builder:
@@ -388,7 +410,7 @@
     name: 'functest-kubernetes-pi-{tag}-daily'
     project-type: multijob
     triggers:
-      - timed: '@daily'
+      - timed: '@weekly'
     parameters:
       - functest-kubernetes-pi-slave:
           slave: '{slave}'
@@ -401,7 +423,7 @@
     properties:
       - build-blocker:
           use-build-blocker: true
-          blocking-level: 'NODE'
+          blocking-level: 'GLOBAL'
           blocking-jobs:
             - '^functest-kubernetes(-pi)?-(arm.*-|amd64-)*[a-z]+-(daily|gate|check)$'
     builders:
@@ -414,6 +436,8 @@
               <<: *functest-kubernetes-pi-jobs
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-{tag}-rmi'
               <<: *functest-kubernetes-pi-jobs
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-{tag}-rmi'
+              <<: *functest-kubernetes-pi-jobs
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-rmi'
               <<: *functest-kubernetes-pi-jobs
       - multijob:
@@ -425,11 +449,15 @@
               <<: *functest-kubernetes-pi-jobs
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-{tag}-pull'
               <<: *functest-kubernetes-pi-jobs
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-{tag}-pull'
+              <<: *functest-kubernetes-pi-jobs
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-pull'
               <<: *functest-kubernetes-pi-jobs
       - multijob:
           name: ollivier/functest-kubernetes-healthcheck:{tag}
           projects:
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-{tag}-k8s_quick-run'
+              <<: *functest-kubernetes-pi-jobs
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-{tag}-k8s_smoke-run'
               <<: *functest-kubernetes-pi-jobs
       - multijob:
@@ -446,9 +474,16 @@
               <<: *functest-kubernetes-pi-jobs
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-{tag}-kube_bench-run'
               <<: *functest-kubernetes-pi-jobs
+      - multijob:
+          name: ollivier/functest-kubernetes-benchmarking:{tag}
+          projects:
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-{tag}-xrally_kubernetes_full-run'
+              <<: *functest-kubernetes-pi-jobs
       - multijob:
           name: ollivier/functest-kubernetes-cnf:{tag}
           projects:
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-cnf_conformance-run'
+              <<: *functest-kubernetes-pi-jobs
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-k8s_vims-run'
               <<: *functest-kubernetes-pi-jobs
       - multijob: