From 83300bdc60300c5d0ec0031fb1bd8d93118da074 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Thu, 19 Oct 2023 16:49:27 +0200 Subject: [PATCH] Fix Elements path MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I552355a7758ff95c9b2ce03d6f8a5deac152dc16 Signed-off-by: Cédric Ollivier --- jjb/functest/xtesting-ci-vm.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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 -- 2.16.6