From 5838680a31058fb0e396a9adc6c8927e5b22f2fa Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Sat, 29 Sep 2018 04:57:04 +0000 Subject: [PATCH] Updated from OpenStack Ansible Tests Change-Id: I3e51f4457fd85171ac363094e31f9b2787c93480 --- run_tests.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/run_tests.sh b/run_tests.sh index 4280085..cbffb04 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -33,6 +33,7 @@ set -xeu ## Vars ---------------------------------------------------------------------- WORKING_DIR="$(readlink -f $(dirname $0))" +OSA_PROJECT_NAME="$(sed -n 's|^project=openstack/\(.*\).git$|\1|p' $(pwd)/.gitreview)" COMMON_TESTS_PATH="${WORKING_DIR}/tests/common" TESTING_HOME=${TESTING_HOME:-$HOME} @@ -69,7 +70,7 @@ which git &>/dev/null || eval sudo "${pkg_mgr_cmd}" git if [[ ! -d "${COMMON_TESTS_PATH}" ]]; then # The tests repo doesn't need a clone, we can just # symlink it. - if [[ "$(basename ${WORKING_DIR})" == "openstack-ansible-tests" ]]; then + if [[ "${OSA_PROJECT_NAME}" == "openstack-ansible-tests" ]]; then ln -s "${WORKING_DIR}" "${COMMON_TESTS_PATH}" # In zuul v3 any dependent repository is placed into