From e10223883ecb66b9233d0f45ebbb9d5f57eba78a Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Mon, 26 Nov 2018 11:08:42 +0100
Subject: Avoid possible deadblocks in Functest jjbs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 jjb/functest/functest-virtual.yaml | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/jjb/functest/functest-virtual.yaml b/jjb/functest/functest-virtual.yaml
index baadf12e6..17341076c 100644
--- 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
-- 
cgit 1.2.3-korg