summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2023-10-21 17:52:37 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2023-10-21 18:04:10 +0200
commitdb794ab6fbc2dc3d80e1fbce2667cb92f9c97077 (patch)
treec04a9bb481a2c179fa22f0b10d8795be1d22aff2
parent7493ea1d95ffb72cc02444c94f8d2452525c6919 (diff)
Fix ELEMENT_PATH logic
Change-Id: Ifdb4731cce556b2569c126e40091191625f1d2be Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--jjb/functest/xtesting-ci-vm.yaml9
1 files 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