Prevent cnf-testsuite to be executed twice in //

Falco installation logics break multi testing.

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

diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index ad65ddd..5daf98d 100644 (file)
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -510,7 +510,7 @@
     properties:
       - build-blocker:
           blocking-jobs:
-          - ^functest-kubernetes-(pi-)*{tag}-(daily|docker|review)$
+          - ^functest-kubernetes-(pi-)*.*-(daily|docker|review)$
     # yamllint enable rule:indentation
     builders:
       - multijob:

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index f24a48a..e9bb622 100644 (file)
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -510,7 +510,7 @@
     properties:
       - build-blocker:
           blocking-jobs:
-          - ^functest-kubernetes-(pi-)*{tag}-(daily|docker|review)$
+          - ^functest-kubernetes-(pi-)*.*-(daily|docker|review)$
     # yamllint enable rule:indentation
     builders:
       - multijob:
@@ -893,7 +893,7 @@
     properties:
       - build-blocker:
           blocking-jobs:
-          - ^functest-kubernetes-(pi-)*{tag}-(daily|docker|review)$
+          - ^functest-kubernetes-(pi-)*.*-(daily|docker|review)$
     # yamllint enable rule:indentation
     builders:
       - multijob:
@@ -1154,7 +1154,7 @@
     properties:
       - build-blocker:
           blocking-jobs:
-          - ^functest-kubernetes-(pi-)*{tag}-(daily|docker|review)$
+          - ^functest-kubernetes-(pi-)*.*-(daily|docker|review)$
     # yamllint enable rule:indentation
     builders:
       - multijob: