engine: Adjust build blockers

[infra/cicd.git] / jjb / engine / verify-jobs / engine-verify-deploy-test.yaml

diff --git a/jjb/engine/verify-jobs/engine-verify-deploy-test.yaml b/jjb/engine/verify-jobs/engine-verify-deploy-test.yaml
index e0a47b0a790d7fb0e657b763e6f21f665276537c..da08cf152e94d1d550c55fbc860850cbc3dafd6d 100644 (file)
--- a/jjb/engine/verify-jobs/engine-verify-deploy-test.yaml
+++ b/jjb/engine/verify-jobs/engine-verify-deploy-test.yaml
@@ -81,10 +81,6 @@
     concurrent: true
 
     parameters:
-      - project-parameters:
-          project: $GERRIT_PROJECT
-          branch: '{branch}'
-          description: 'The project and branch which the change is proposed for'
       - label:
           name: SLAVE_LABEL
           default: 'engine-{slave-type}-online-{distro}'
@@ -169,6 +165,11 @@
           name: ARTIFACT_TO_DOWNLOAD
           default: "https://artifactory.nordix.org/artifactory/nordix-kubernetes/installer/oss/gerrit/$GERRIT_CHANGE_ID/k8s-installer-ubuntu1804.bsx"
           description: 'Artifact to download'
+      - project-parameters:
+          project: $GERRIT_PROJECT
+          branch: '{branch}'
+          description: 'The project and branch which the change is proposed for'
+      - nordix-gerrit-parameters
 
     properties:
       - logrotate
@@ -176,6 +177,12 @@
           max-per-node: 1
           max-total: 3
           option: project
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'engine-verify-online-deploy-test-.*'
+            - 'engine-verify-offline-deploy-test-.*'
+          block-level: 'NODE'
 
     wrappers:
       - build-timeout: