From: Cedric Ollivier <cedric.ollivier@orange.com>
Date: Thu, 19 Oct 2023 14:55:09 +0000 (+0000)
Subject: Merge "Fix Elements path"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=528bf1684d7008e9b0134d9f4883d4e8c29d3669;hp=58d4e8ac35875c27a538a3a26e95c8ec2d041793;p=releng.git

Merge "Fix Elements path"
---

diff --git a/jjb/functest/xtesting-ci-vm.yaml b/jjb/functest/xtesting-ci-vm.yaml
index af08c5276..b049aecf3 100644
--- a/jjb/functest/xtesting-ci-vm.yaml
+++ b/jjb/functest/xtesting-ci-vm.yaml
@@ -63,7 +63,7 @@
           DEBIAN_FRONTEND=noninteractive sudo apt-get \
             -o DPkg::Lock::Timeout=300 install python3-diskimage-builder -y
           git clone https://github.com/collivier/ansible-role-xtesting.git
-          export ELEMENTS_PATH=$(pwd)/elements
+          export ELEMENTS_PATH=$(pwd)/elements:$(pwd)/ansible-role-xtesting/elements
           export DIB_DEBIAN_COMPONENTS=main,contrib,non-free
           export DIB_DEV_USER_SHELL=/bin/bash
           export DIB_OPENSSH_SERVER_HARDENING=0
@@ -86,7 +86,7 @@
           DEBIAN_FRONTEND=noninteractive sudo apt-get \
             -o DPkg::Lock::Timeout=300 install python3-diskimage-builder -y
           git clone https://github.com/collivier/ansible-role-xtesting.git
-          export ELEMENTS_PATH=$(pwd)/elements
+          export ELEMENTS_PATH=$(pwd)/elements:$(pwd)/ansible-role-xtesting/elements
           export DIB_DEBIAN_COMPONENTS=main,contrib,non-free
           export DIB_DEV_USER_SHELL=/bin/bash
           export DIB_OPENSSH_SERVER_HARDENING=0
@@ -118,6 +118,12 @@
       - xtesting-ci-vm-trigger
     parameters:
       - xtesting-ci-vm-parameter
+    properties:
+      - build-blocker:
+          use-build-blocker: true
+          blocking-level: 'NODE'
+          blocking-jobs:
+            - '^.*-vm$'
     builders:
       - xtesting-ci-vm-builder