Use same slave for K8s Jerma and master

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

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 5bfa717..f235c4d 100644 (file)
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -11,6 +11,9 @@
       - latest:
           branch: master
           slave: lf-virtual8
+      - jerma:
+          branch: stable/jerma
+          slave: lf-virtual8
       - iruya:
           branch: stable/iruya
           slave: lf-virtual7
@@ -158,13 +161,6 @@
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
 
-- project:
-    name: 'functest-kubernetes-opnfv-functest-kubernetes-features-pull'
-    <<: *functest-kubernetes-params
-    container: 'functest-kubernetes-features'
-    jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
-
 - job-template:
     name: 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
     parameters:
@@ -188,13 +184,6 @@
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
 
-- project:
-    name: 'functest-kubernetes-opnfv-functest-kubernetes-features-rmi'
-    <<: *functest-kubernetes-params
-    container: 'functest-kubernetes-features'
-    jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
-
 - job-template:
     name: 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
     parameters:
@@ -218,19 +207,15 @@
     <<: *functest-kubernetes-params
     container: 'functest-kubernetes-smoke'
     test:
+      - xrally_kubernetes
       - k8s_conformance
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
-
-- project:
-    name: 'functest-kubernetes-opnfv-functest-kubernetes-features'
-    <<: *functest-kubernetes-params
-    container: 'functest-kubernetes-features'
-    test:
-      - stor4nfv_k8s
-      - clover_k8s
-    jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
+    exclude:
+      - tag: iruya
+        test: xrally_kubernetes
+      - tag: hunter
+        test: xrally_kubernetes
 
 - job-template:
     name: 'functest-kubernetes-{tag}-daily'
@@ -254,8 +239,6 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-rmi'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-rmi'
-              <<: *functest-kubernetes-jobs
       - multijob:
           name: pull containers
           projects:
@@ -263,8 +246,6 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-pull'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-pull'
-              <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-healthcheck:{tag}
           projects:
@@ -272,15 +253,11 @@
               <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-smoke:{tag}
+          execution-type: SEQUENTIALLY
           projects:
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run'
-              <<: *functest-kubernetes-jobs
-      - multijob:
-          name: opnfv/functest-kubernetes-features:{tag}
-          projects:
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-stor4nfv_k8s-run'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-xrally_kubernetes-run'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-clover_k8s-run'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run'
               <<: *functest-kubernetes-jobs
 
 - job-template:
@@ -312,21 +289,21 @@
           ref: $branch
 
 - project:
-    name: 'functest-kubernetes-_-golang-alpine3.9-rmi'
+    name: 'functest-kubernetes-_-golang-1.12-alpine3.10-rmi'
     repo: _
     port:
     container: golang
-    tag: alpine3.9
+    tag: '1.12-alpine3.10'
     slave: master
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-kubernetes-_-golang-alpine3.9-pull'
+    name: 'functest-kubernetes-_-golang-1.12-alpine3.10-pull'
     repo: _
     port:
     container: golang
-    tag: alpine3.9
+    tag: '1.12-alpine3.10'
     slave: master
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
@@ -361,16 +338,6 @@
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
       - 'functest-kubernetes-{repo}-{container}-{tag}-check'
 
-- project:
-    name: functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-build
-    <<: *functest-kubernetes-params
-    container: functest-kubernetes-features
-    ref_arg:
-    path: docker/features
-    jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
-      - 'functest-kubernetes-{repo}-{container}-{tag}-check'
-
 - job-template:
     name: 'functest-kubernetes-{tag}-check'
     project-type: multijob
@@ -393,17 +360,15 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-rmi'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-rmi'
-              <<: *functest-kubernetes-jobs
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-alpine3.9-rmi'
+            - name: 'functest-kubernetes-_-golang-1.12-alpine3.10-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-alpine3.9-pull'
+            - name: 'functest-kubernetes-_-golang-1.12-alpine3.10-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build opnfv/functest-kubernetes-core
@@ -420,8 +385,6 @@
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-check'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-check'
-              <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-healthcheck:{tag}
           projects:
@@ -429,15 +392,11 @@
               <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-smoke:{tag}
+          execution-type: SEQUENTIALLY
           projects:
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run'
-              <<: *functest-kubernetes-jobs
-      - multijob:
-          name: opnfv/functest-kubernetes-features:{tag}
-          projects:
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-stor4nfv_k8s-run'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-xrally_kubernetes-run'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-clover_k8s-run'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run'
               <<: *functest-kubernetes-jobs
 
 - trigger:
@@ -486,17 +445,15 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-rmi'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-rmi'
-              <<: *functest-kubernetes-jobs
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-alpine3.9-rmi'
+            - name: 'functest-kubernetes-_-golang-1.12-alpine3.10-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-alpine3.9-pull'
+            - name: 'functest-kubernetes-_-golang-1.12-alpine3.10-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build opnfv/functest-kubernetes-core
@@ -513,8 +470,6 @@
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-gate'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-gate'
-              <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-healthcheck:{tag}
           projects:
@@ -522,15 +477,11 @@
               <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-smoke:{tag}
+          execution-type: SEQUENTIALLY
           projects:
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-xrally_kubernetes-run'
               <<: *functest-kubernetes-jobs
-      - multijob:
-          name: opnfv/functest-kubernetes-features:{tag}
-          projects:
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-stor4nfv_k8s-run'
-              <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-clover_k8s-run'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run'
               <<: *functest-kubernetes-jobs
 
 - project: