Merge "Remove ericsson-build3 from Jenkins"

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

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 5b21204..db5c500 100644 (file)
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -270,6 +270,27 @@
       - 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
@@ -314,7 +335,7 @@
     privileged: 'false'
     network: bridge
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
+      - 'functest-kubernetes-{repo}-functest-kubernetes-cnf-{tag}-k8s_vims-run'
 
 
 - builder:
@@ -362,7 +383,7 @@
 - project:
     name: 'functest-kubernetes-{tag}-zip'
     <<: *functest-kubernetes-params
-    container: 'functest-kubernetes-security'
+    container: 'functest-kubernetes-healthcheck'
     jobs:
       - 'functest-kubernetes-{tag}-zip'
 
@@ -468,11 +489,11 @@
           ref: $branch
 
 - project:
-    name: 'functest-kubernetes-_-golang-1.14-alpine3.12-rmi'
+    name: 'functest-kubernetes-_-golang-1.15-alpine3.12-rmi'
     repo: _
     port:
     container: golang
-    tag: '1.14-alpine3.12'
+    tag: '1.15-alpine3.12'
     slave: master
     exclude:
       - tag: arm64-latest
@@ -484,11 +505,11 @@
       - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-kubernetes-_-golang-1.14-alpine3.12-pull'
+    name: 'functest-kubernetes-_-golang-1.15-alpine3.12-pull'
     repo: _
     port:
     container: golang
-    tag: '1.14-alpine3.12'
+    tag: '1.15-alpine3.12'
     slave: master
     exclude:
       - tag: arm64-latest
@@ -614,12 +635,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-1.14-alpine3.12-rmi'
+            - name: 'functest-kubernetes-_-golang-1.15-alpine3.12-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-1.14-alpine3.12-pull'
+            - name: 'functest-kubernetes-_-golang-1.15-alpine3.12-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build opnfv/functest-kubernetes-core
@@ -724,12 +745,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-1.14-alpine3.12-rmi'
+            - name: 'functest-kubernetes-_-golang-1.15-alpine3.12-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-1.14-alpine3.12-pull'
+            - name: 'functest-kubernetes-_-golang-1.15-alpine3.12-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build opnfv/functest-kubernetes-core