diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2023-10-21 16:10:29 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2023-10-21 16:10:29 +0000 |
| commit | 014256ec73458eb5fb9fe544084f00d584118283 (patch) | |
| tree | 7efd86806e0c2404e70325836c2d70eacc0dacee /jjb/functest | |
| parent | d688e36ffa473fd6a9e2500ea2bdc4695e747e50 (diff) | |
| parent | db794ab6fbc2dc3d80e1fbce2667cb92f9c97077 (diff) | |
Merge "Fix ELEMENT_PATH logic"
Diffstat (limited to 'jjb/functest')
| -rw-r--r-- | jjb/functest/xtesting-ci-vm.yaml | 9 |
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 |