Merge "Run tempest_cyborg if kali"

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

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 55e4657..042154e 100644 (file)
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -267,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'
 
@@ -394,7 +389,6 @@
               <<: *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
@@ -447,21 +441,21 @@
           ref: $branch
 
 - project:
-    name: 'functest-kubernetes-_-golang-1.13-alpine3.12-rmi'
+    name: 'functest-kubernetes-_-golang-1.14-alpine3.12-rmi'
     repo: _
     port:
     container: golang
-    tag: '1.13-alpine3.12'
+    tag: '1.14-alpine3.12'
     slave: master
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-kubernetes-_-golang-1.13-alpine3.12-pull'
+    name: 'functest-kubernetes-_-golang-1.14-alpine3.12-pull'
     repo: _
     port:
     container: golang
-    tag: '1.13-alpine3.12'
+    tag: '1.14-alpine3.12'
     slave: master
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
@@ -551,12 +545,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-1.13-alpine3.12-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.12-pull'
+            - name: 'functest-kubernetes-_-golang-1.14-alpine3.12-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build opnfv/functest-kubernetes-core
@@ -662,12 +656,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-1.13-alpine3.12-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.12-pull'
+            - name: 'functest-kubernetes-_-golang-1.14-alpine3.12-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build opnfv/functest-kubernetes-core