From: Cedric Ollivier <cedric.ollivier@orange.com>
Date: Sat, 21 Oct 2023 16:10:29 +0000 (+0000)
Subject: Merge "Fix ELEMENT_PATH logic"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=014256ec73458eb5fb9fe544084f00d584118283;hp=d688e36ffa473fd6a9e2500ea2bdc4695e747e50;p=releng.git

Merge "Fix ELEMENT_PATH logic"
---

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