summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2018-09-29 04:53:23 +0000
committerOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2018-09-29 04:53:23 +0000
commitf0a948cf6085e2d900813f1d3feef59cb922659e (patch)
tree463afee4557c8d7c693346aa84198a8c6a1ef0a0
parent2de30886b79c1dccbcc3ec0816d73516fc988019 (diff)
Updated from OpenStack Ansible Tests
Notes
Notes (review): Code-Review+2: Jesse Pretorius (odyssey4me) <jesse.pretorius@rackspace.co.uk> Workflow+1: Jesse Pretorius (odyssey4me) <jesse.pretorius@rackspace.co.uk> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Sat, 29 Sep 2018 13:15:29 +0000 Reviewed-on: https://review.openstack.org/606260 Project: openstack/openstack-ansible-os_almanach Branch: refs/heads/master
-rwxr-xr-xrun_tests.sh3
1 files changed, 2 insertions, 1 deletions
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
33## Vars ---------------------------------------------------------------------- 33## Vars ----------------------------------------------------------------------
34 34
35WORKING_DIR="$(readlink -f $(dirname $0))" 35WORKING_DIR="$(readlink -f $(dirname $0))"
36OSA_PROJECT_NAME="$(sed -n 's|^project=openstack/\(.*\).git$|\1|p' $(pwd)/.gitreview)"
36 37
37COMMON_TESTS_PATH="${WORKING_DIR}/tests/common" 38COMMON_TESTS_PATH="${WORKING_DIR}/tests/common"
38TESTING_HOME=${TESTING_HOME:-$HOME} 39TESTING_HOME=${TESTING_HOME:-$HOME}
@@ -69,7 +70,7 @@ which git &>/dev/null || eval sudo "${pkg_mgr_cmd}" git
69if [[ ! -d "${COMMON_TESTS_PATH}" ]]; then 70if [[ ! -d "${COMMON_TESTS_PATH}" ]]; then
70 # The tests repo doesn't need a clone, we can just 71 # The tests repo doesn't need a clone, we can just
71 # symlink it. 72 # symlink it.
72 if [[ "$(basename ${WORKING_DIR})" == "openstack-ansible-tests" ]]; then 73 if [[ "${OSA_PROJECT_NAME}" == "openstack-ansible-tests" ]]; then
73 ln -s "${WORKING_DIR}" "${COMMON_TESTS_PATH}" 74 ln -s "${WORKING_DIR}" "${COMMON_TESTS_PATH}"
74 75
75 # In zuul v3 any dependent repository is placed into 76 # In zuul v3 any dependent repository is placed into