From 782340833e207982811dd648857c42184b84c9e6 Mon Sep 17 00:00:00 2001 From: Sagi Shnaidman Date: Sun, 22 Dec 2024 14:50:05 +0200 Subject: [PATCH] Fix deprecated ANSIBLE_COLLECTIONS_PATHS variable Change it to ANSIBLE_COLLECTIONS_PATH Change-Id: I6100e1da0e578c26dd90c05b7bd5eeddcaec983b --- ci/run-ansible-tests-collection.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/run-ansible-tests-collection.sh b/ci/run-ansible-tests-collection.sh index af03dad4..c9355ab8 100755 --- a/ci/run-ansible-tests-collection.sh +++ b/ci/run-ansible-tests-collection.sh @@ -75,10 +75,10 @@ ansible-galaxy collection install --requirements-file ci/requirements.yml if [ -z "$PIP_INSTALL" ]; then tox -ebuild ansible-galaxy collection install "$(find build_artifact/ -maxdepth 1 -name 'openstack-cloud-*')" --force - TEST_COLLECTIONS_PATHS=${HOME}/.ansible/collections:$ANSIBLE_COLLECTIONS_PATHS + TEST_COLLECTIONS_PATHS=${HOME}/.ansible/collections:$ANSIBLE_COLLECTIONS_PATH else pip freeze | grep ansible-collections-openstack - TEST_COLLECTIONS_PATHS=$VIRTUAL_ENV/share/ansible/collections:$ANSIBLE_COLLECTIONS_PATHS + TEST_COLLECTIONS_PATHS=$VIRTUAL_ENV/share/ansible/collections:$ANSIBLE_COLLECTIONS_PATH fi # We need to source the current tox environment so that Ansible will @@ -129,7 +129,7 @@ cd ci/ # Run tests set -o pipefail # shellcheck disable=SC2086 -ANSIBLE_COLLECTIONS_PATHS=$TEST_COLLECTIONS_PATHS ansible-playbook \ +ANSIBLE_COLLECTIONS_PATH=$TEST_COLLECTIONS_PATHS ansible-playbook \ -vvv ./run-collection.yml \ -e "sdk_version=${SDK_VER} cloud=${CLOUD} cloud_alt=${CLOUD_ALT} ${ANSIBLE_VARS}" \ ${tag_opt} 2>&1 | sudo tee /opt/stack/logs/test_output.log