X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-kubernetes.yaml;h=042154e93c65cda1733914fc32aa3aa9c95efa1c;hb=a39dcbab37a210cf12b2b1e4aa1d1636c89fd292;hp=7b15f32ae7d9504a9ed36a210d7aa0d97d646525;hpb=f24c4bedc3ea749bc90837f33707486b0e79c65d;p=releng.git

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 7b15f32ae..042154e93 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -10,16 +10,19 @@
     tag:
       - latest:
           branch: master
-          slave: lf-virtual8
+          slave: lf-virtual1-5
+      - kali:
+          branch: stable/kali
+          slave: lf-virtual1-4
       - jerma:
           branch: stable/jerma
-          slave: lf-virtual8
+          slave: lf-virtual1-3
       - iruya:
           branch: stable/iruya
-          slave: lf-virtual7
+          slave: lf-virtual1-2
       - hunter:
           branch: stable/hunter
-          slave: lf-virtual5
+          slave: lf-virtual1-1
 
 - parameter:
     name: functest-kubernetes-slave
@@ -186,10 +189,6 @@
     name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-pull'
     <<: *functest-kubernetes-params
     container: 'functest-kubernetes-cnf'
-    exclude:
-      - tag: jerma
-      - tag: iruya
-      - tag: hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
 
@@ -197,10 +196,6 @@
     name: 'functest-kubernetes-opnfv-functest-kubernetes-security-pull'
     <<: *functest-kubernetes-params
     container: 'functest-kubernetes-security'
-    exclude:
-      - tag: jerma
-      - tag: iruya
-      - tag: hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
 
@@ -231,10 +226,6 @@
     name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-rmi'
     <<: *functest-kubernetes-params
     container: 'functest-kubernetes-cnf'
-    exclude:
-      - tag: jerma
-      - tag: iruya
-      - tag: hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
 
@@ -242,10 +233,6 @@
     name: 'functest-kubernetes-opnfv-functest-kubernetes-security-rmi'
     <<: *functest-kubernetes-params
     container: 'functest-kubernetes-security'
-    exclude:
-      - tag: jerma
-      - tag: iruya
-      - tag: hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
 
@@ -280,11 +267,6 @@
     test:
       - xrally_kubernetes
       - k8s_conformance
-    exclude:
-      - tag: iruya
-        test: xrally_kubernetes
-      - tag: hunter
-        test: xrally_kubernetes
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
 
@@ -294,13 +276,6 @@
     container: 'functest-kubernetes-cnf'
     test:
       - k8s_vims
-    exclude:
-      - tag: jerma
-        test: k8s_vims
-      - tag: iruya
-        test: k8s_vims
-      - tag: hunter
-        test: k8s_vims
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
 
@@ -311,19 +286,6 @@
     test:
       - kube_hunter
       - kube_bench
-    exclude:
-      - tag: jerma
-        test: kube_hunter
-      - tag: jerma
-        test: kube_bench
-      - tag: iruya
-        test: kube_hunter
-      - tag: iruya
-        test: kube_bench
-      - tag: hunter
-        test: kube_hunter
-      - tag: hunter
-        test: kube_bench
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
 
@@ -427,17 +389,11 @@
               <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-smoke:{tag}
-          execution-type: SEQUENTIALLY
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-xrally_kubernetes-run'
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-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
       - multijob:
           name: opnfv/functest-kubernetes-security:{tag}
           projects:
@@ -445,6 +401,11 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench-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
       - multijob:
           name: dump all campaign data
           projects:
@@ -480,21 +441,21 @@
           ref: $branch
 
 - project:
-    name: 'functest-kubernetes-_-golang-1.13-alpine3.11-rmi'
+    name: 'functest-kubernetes-_-golang-1.14-alpine3.12-rmi'
     repo: _
     port:
     container: golang
-    tag: '1.13-alpine3.11'
+    tag: '1.14-alpine3.12'
     slave: master
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-kubernetes-_-golang-1.13-alpine3.11-pull'
+    name: 'functest-kubernetes-_-golang-1.14-alpine3.12-pull'
     repo: _
     port:
     container: golang
-    tag: '1.13-alpine3.11'
+    tag: '1.14-alpine3.12'
     slave: master
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
@@ -525,10 +486,6 @@
     container: functest-kubernetes-cnf
     ref_arg: BRANCH
     path: docker/cnf
-    exclude:
-      - tag: jerma
-      - tag: iruya
-      - tag: hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
       - 'functest-kubernetes-{repo}-{container}-{tag}-check'
@@ -539,10 +496,6 @@
     container: functest-kubernetes-security
     ref_arg: BRANCH
     path: docker/security
-    exclude:
-      - tag: jerma
-      - tag: iruya
-      - tag: hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
       - 'functest-kubernetes-{repo}-{container}-{tag}-check'
@@ -592,12 +545,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-1.13-alpine3.11-rmi'
+            - name: 'functest-kubernetes-_-golang-1.14-alpine3.12-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-1.13-alpine3.11-pull'
+            - name: 'functest-kubernetes-_-golang-1.14-alpine3.12-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build opnfv/functest-kubernetes-core
@@ -631,11 +584,6 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-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
       - multijob:
           name: opnfv/functest-kubernetes-security:{tag}
           projects:
@@ -643,6 +591,11 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench-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
 
 - trigger:
     name: functest-kubernetes-patchset-created
@@ -703,12 +656,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-1.13-alpine3.11-rmi'
+            - name: 'functest-kubernetes-_-golang-1.14-alpine3.12-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-1.13-alpine3.11-pull'
+            - name: 'functest-kubernetes-_-golang-1.14-alpine3.12-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build opnfv/functest-kubernetes-core
@@ -742,11 +695,6 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-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
       - multijob:
           name: opnfv/functest-kubernetes-security:{tag}
           projects:
@@ -754,6 +702,11 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench-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
 
 - project:
     name: 'functest-kubernetes'
@@ -773,4 +726,16 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-kubernetes-[a-z]+-(daily|check|gate)$
+    regex: ^functest-kubernetes-[a-z]+-daily$
+
+- view:
+    name: functest-kubernetes-gate
+    view-type: list
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+    regex: ^functest-kubernetes-[a-z]+-gate$