Code Review / releng.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Remove all arm refs in views
[releng.git] / jjb / functest / functest-kubernetes.yaml
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 8295627..01022df 100644 (file)
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -10,6 +10,9 @@
     tag:
       - latest:
           branch: master
+          slave: lf-virtual1-6
+      - leguer:
+          branch: stable/leguer
           slave: lf-virtual1-5
       - kali:
           branch: stable/kali
@@ -23,21 +26,6 @@
       - hunter:
           branch: stable/hunter
           slave: lf-virtual1-1
-      - arm64-latest:
-          branch: master
-          slave: lf-virtual1-5
-      - arm64-kali:
-          branch: stable/kali
-          slave: lf-virtual1-4
-      - arm64-jerma:
-          branch: stable/jerma
-          slave: lf-virtual1-3
-      - arm64-iruya:
-          branch: stable/iruya
-          slave: lf-virtual1-2
-      - arm64-hunter:
-          branch: stable/hunter
-          slave: lf-virtual1-1
 
 - parameter:
     name: functest-kubernetes-slave
@@ -284,32 +272,12 @@
       - functest-kubernetes-run-containers:
           <<: *functest-kubernetes-run-containers
 
-- job-template:
-    name: 'functest-kubernetes-{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-slave:
-          slave: '{slave}'
-      - functest-kubernetes-build_tag:
-          build_tag: ''
-      - functest-kubernetes-DEPLOY_SCENARIO:
-          DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
-      - functest-kubernetes-DEBUG:
-          DEBUG: 'true'
-    builders:
-      - functest-kubernetes-run-containers:
-          <<: *functest-kubernetes-run-containers
-
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck'
     <<: *functest-kubernetes-params
     container: 'functest-kubernetes-healthcheck'
     test:
+      - k8s_quick
       - k8s_smoke
     privileged: 'false'
     network: bridge
@@ -334,7 +302,8 @@
     container: 'functest-kubernetes-security'
     test:
       - kube_hunter
-      - kube_bench
+      - kube_bench_master
+      - kube_bench_node
     privileged: 'false'
     network: bridge
     jobs:
@@ -357,10 +326,17 @@
     container: 'functest-kubernetes-cnf'
     test:
       - k8s_vims
+      - helm_vims
+      - cnf_conformance
+    exclude:
+      - tag: iruya
+        test: k8s_vims
+      - tag: iruya
+        test: helm_vims
     privileged: 'false'
     network: bridge
     jobs:
-      - 'functest-kubernetes-{repo}-functest-kubernetes-cnf-{tag}-k8s_vims-run'
+      - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
 
 
 - builder:
@@ -416,7 +392,7 @@
     name: 'functest-kubernetes-{tag}-daily'
     project-type: multijob
     triggers:
-      - timed: '@daily'
+      - timed: '@weekly'
     parameters:
       - functest-kubernetes-slave:
           slave: '{slave}'
@@ -429,7 +405,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:
@@ -462,6 +438,8 @@
       - multijob:
           name: opnfv/functest-kubernetes-healthcheck:{tag}
           projects:
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-k8s_quick-run'
+              <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-k8s_smoke-run'
               <<: *functest-kubernetes-jobs
       - multijob:
@@ -476,7 +454,9 @@
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_hunter-run'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench-run'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench_master-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench_node-run'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-benchmarking:{tag}
@@ -488,6 +468,10 @@
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-k8s_vims-run'
               <<: *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'
+              <<: *functest-kubernetes-jobs
       - multijob:
           name: dump all campaign data
           projects:
@@ -529,12 +513,6 @@
     container: golang
     tag: '1.15-alpine3.12'
     slave: master
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
 
@@ -545,12 +523,6 @@
     container: golang
     tag: '1.15-alpine3.12'
     slave: master
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
 
@@ -560,12 +532,6 @@
     container: functest-kubernetes-core
     ref_arg: BRANCH
     path: docker/core
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
       - 'functest-kubernetes-{repo}-{container}-{tag}-check'
@@ -576,12 +542,6 @@
     container: functest-kubernetes-healthcheck
     ref_arg:
     path: docker/healthcheck
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
       - 'functest-kubernetes-{repo}-{container}-{tag}-check'
@@ -592,12 +552,6 @@
     container: functest-kubernetes-cnf
     ref_arg: BRANCH
     path: docker/cnf
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
       - 'functest-kubernetes-{repo}-{container}-{tag}-check'
@@ -608,12 +562,6 @@
     container: functest-kubernetes-security
     ref_arg: BRANCH
     path: docker/security
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
       - 'functest-kubernetes-{repo}-{container}-{tag}-check'
@@ -624,12 +572,6 @@
     container: functest-kubernetes-smoke
     ref_arg:
     path: docker/smoke
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
       - 'functest-kubernetes-{repo}-{container}-{tag}-check'
@@ -640,12 +582,6 @@
     container: functest-kubernetes-benchmarking
     ref_arg:
     path: docker/benchmarking
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
       - 'functest-kubernetes-{repo}-{container}-{tag}-check'
@@ -667,7 +603,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:
@@ -721,6 +657,8 @@
       - multijob:
           name: opnfv/functest-kubernetes-healthcheck:{tag}
           projects:
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-k8s_quick-run'
+              <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-k8s_smoke-run'
               <<: *functest-kubernetes-jobs
       - multijob:
@@ -740,13 +678,19 @@
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_hunter-run'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench-run'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench_master-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench_node-run'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-cnf:{tag}
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-k8s_vims-run'
               <<: *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'
+              <<: *functest-kubernetes-jobs
 
 - trigger:
     name: functest-kubernetes-patchset-created
@@ -789,7 +733,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:
@@ -843,6 +787,8 @@
       - multijob:
           name: opnfv/functest-kubernetes-healthcheck:{tag}
           projects:
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-k8s_quick-run'
+              <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-k8s_smoke-run'
               <<: *functest-kubernetes-jobs
       - multijob:
@@ -857,7 +803,9 @@
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_hunter-run'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench-run'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench_master-run'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench_node-run'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-benchmarking:{tag}
@@ -869,6 +817,10 @@
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-k8s_vims-run'
               <<: *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'
+              <<: *functest-kubernetes-jobs
 
 - project:
     name: 'functest-kubernetes'
@@ -879,12 +831,6 @@
 - project:
     name: 'functest-kubernetes-gate'
     <<: *functest-kubernetes-params
-    exclude:
-      - tag: arm64-latest
-      - tag: arm64-kali
-      - tag: arm64-jerma
-      - tag: arm64-iruya
-      - tag: arm64-hunter
     jobs:
       - 'functest-kubernetes-{tag}-check'
       - 'functest-kubernetes-{tag}-gate'
@@ -899,7 +845,7 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-kubernetes-(arm.*-|amd64-)*[a-z]+-daily$
+    regex: ^functest-kubernetes-(amd64-)*[a-z]+-daily$
 
 - view:
     name: functest-kubernetes-gate
@@ -911,4 +857,4 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-kubernetes-(arm.*-|amd64-)*[a-z]+-gate$
+    regex: ^functest-kubernetes-(amd64-)*[a-z]+-gate$