Avoid possible deadblocks in Functest jjbs

From the time being, only 2 executors are allowed and then it may lead
to deadblocks if two multijobs are executed.

Normally we should only forbid gate and daily jobs at the time (tags are hardcoded).

It reverts to new patchset triggers as on core approval is buggy.

Daily jobs are now triggered once a day.

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

diff --git a/jjb/functest/functest-virtual.yaml b/jjb/functest/functest-virtual.yaml
index baadf12..1734107 100644 (file)
--- a/jjb/functest/functest-virtual.yaml
+++ b/jjb/functest/functest-virtual.yaml
@@ -217,6 +217,15 @@
     name: '{repo}-functest-{tag}-daily'
     <<: *functest-defaultparameters
     project-type: multijob
+    triggers:
+      - timed: '@daily'
+    properties:
+      - build-blocker:
+          use-build-blocker: true
+          block-level: 'NODE'
+          queue-scanning: 'BUILDABLE'
+          blocking-jobs:
+            - '{repo}-functest-.*-.*'
     parameters:
       - functest-virtual-defaults
     builders:
@@ -338,10 +347,17 @@
     project-type: multijob
     <<: *functest-gateparameters
     triggers:
-      - gerrit-trigger-patchset-approved:
+      - gerrit-trigger-patchset-created:
           project: 'functest'
           branch: '{branch}'
           files: '**'
+    properties:
+      - build-blocker:
+          use-build-blocker: true
+          block-level: 'NODE'
+          queue-scanning: 'BUILDABLE'
+          blocking-jobs:
+            - '{repo}-functest-.*-.*'
     builders:
       - multijob:
           name: build functest-core
@@ -391,6 +407,13 @@
     name: '{repo}-functest-{tag}-check'
     project-type: multijob
     <<: *functest-checkparameters
+    properties:
+      - build-blocker:
+          use-build-blocker: true
+          block-level: 'NODE'
+          queue-scanning: 'BUILDABLE'
+          blocking-jobs:
+            - '{repo}-functest-.*-.*'
     builders:
       - multijob:
           name: build functest-core