From db794ab6fbc2dc3d80e1fbce2667cb92f9c97077 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sat, 21 Oct 2023 17:52:37 +0200 Subject: Fix ELEMENT_PATH logic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ifdb4731cce556b2569c126e40091191625f1d2be Signed-off-by: Cédric Ollivier --- jjb/functest/xtesting-ci-vm.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/jjb/functest/xtesting-ci-vm.yaml b/jjb/functest/xtesting-ci-vm.yaml index 8ab1c03bf..71222d8a0 100644 --- a/jjb/functest/xtesting-ci-vm.yaml +++ b/jjb/functest/xtesting-ci-vm.yaml @@ -49,9 +49,14 @@ sudo apt-get -o DPkg::Lock::Timeout=300 update && \ DEBIAN_FRONTEND=noninteractive sudo apt-get \ -o DPkg::Lock::Timeout=300 install python3-diskimage-builder -y - export ELEMENTS_PATH=$(pwd)/elements + if [ "{project}"" == "xtestingci" ]; then + export ELEMENTS_PATH=$(pwd)/elements + else + git clone https://github.com/collivier/ansible-role-xtesting.git + export ELEMENTS_PATH=$(pwd)/elements:$(pwd)/ansible-role-xtesting/elements + fi disk-image-create --image-size 20 -o {project}-{version}.qcow2 debian vm {project} - gsutil cp xtestingci-{version}.qcow2 gs://artifacts.opnfv.org/{project}/{project}-{version}.qcow2 + gsutil cp {project}-{version}.qcow2 gs://artifacts.opnfv.org/{project}/{project}-{version}.qcow2 - trigger: name: xtesting-ci-vm-trigger -- cgit 1.2.3-korg