Avoid verifying kubernetes and OS in //

It raises side effects when verifying OS.
It will ease finding the root causes.

Change-Id: I76a474d051aa426010a1216ee9061ab9d281e824
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 45e063c..3bdb61d 100644 (file)
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -236,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
@@ -370,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
@@ -462,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

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 67fd345..17027d7 100644 (file)
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -313,7 +313,7 @@
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-[a-z]+-(daily|check|gate)$'
+            - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -555,7 +555,7 @@
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-[a-z]+-(daily|check|gate)$'
+            - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -727,7 +727,7 @@
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-[a-z]+-(daily|check|gate)$'
+            - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images