diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2023-10-19 14:55:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2023-10-19 14:55:09 +0000 |
| commit | 528bf1684d7008e9b0134d9f4883d4e8c29d3669 (patch) | |
| tree | 78a028047b31b10f376962edf512d0536fd7fb52 /jjb/functest | |
| parent | 58d4e8ac35875c27a538a3a26e95c8ec2d041793 (diff) | |
| parent | 83300bdc60300c5d0ec0031fb1bd8d93118da074 (diff) | |
Merge "Fix Elements path"
Diffstat (limited to 'jjb/functest')
| -rw-r--r-- | jjb/functest/xtesting-ci-vm.yaml | 10 |
1 files 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 |