[fuel/verify] Take into account k8s scenarios

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

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 338363c..628b06e 100644 (file)
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -8,12 +8,10 @@
     repo: 'opnfv'
     port:
     tag:
-      - latest:
-          branch: master
+      - iruya:
+          branch: stable/iruya
       - hunter:
           branch: stable/hunter
-      - gambia:
-          branch: stable/gambia
 
 - parameter:
     name: functest-kubernetes-slave
@@ -238,7 +236,7 @@
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-kubernetes-[a-z]+-(daily|check|gate)$'
+            - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -303,20 +301,20 @@
           ref: $branch
 
 - project:
-    name: 'functest-kubernetes-_-golang-alpine3.8-rmi'
+    name: 'functest-kubernetes-_-golang-alpine3.9-rmi'
     repo: _
     port:
     container: golang
-    tag: alpine3.8
+    tag: alpine3.9
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-kubernetes-_-golang-alpine3.8-pull'
+    name: 'functest-kubernetes-_-golang-alpine3.9-pull'
     repo: _
     port:
     container: golang
-    tag: alpine3.8
+    tag: alpine3.9
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
 
@@ -372,7 +370,7 @@
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-kubernetes-[a-z]+-(daily|check|gate)$'
+            - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -386,12 +384,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-alpine3.8-rmi'
+            - name: 'functest-kubernetes-_-golang-alpine3.9-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-alpine3.8-pull'
+            - name: 'functest-kubernetes-_-golang-alpine3.9-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build opnfv/functest-kubernetes-core
@@ -464,7 +462,7 @@
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-kubernetes-[a-z]+-(daily|check|gate)$'
+            - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -478,12 +476,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-alpine3.8-rmi'
+            - name: 'functest-kubernetes-_-golang-alpine3.9-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-alpine3.8-pull'
+            - name: 'functest-kubernetes-_-golang-alpine3.9-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build opnfv/functest-kubernetes-core