Merge "Updated from OpenStack Ansible Tests"
This commit is contained in:
commit
f6b1c1a61e
15
run_tests.sh
15
run_tests.sh
@ -58,32 +58,33 @@ case ${ID,,} in
|
|||||||
*suse*) pkg_mgr_cmd="zypper -n in" ;;
|
*suse*) pkg_mgr_cmd="zypper -n in" ;;
|
||||||
centos|rhel|fedora) pkg_mgr_cmd="${RHT_PKG_MGR} install -y" ;;
|
centos|rhel|fedora) pkg_mgr_cmd="${RHT_PKG_MGR} install -y" ;;
|
||||||
ubuntu|debian) pkg_mgr_cmd="apt-get install -y" ;;
|
ubuntu|debian) pkg_mgr_cmd="apt-get install -y" ;;
|
||||||
|
gentoo) pkg_mgr_cmd="emerge" ;;
|
||||||
*) echo "unsupported distribution: ${ID,,}"; exit 1 ;;
|
*) echo "unsupported distribution: ${ID,,}"; exit 1 ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# Install git so that we can clone the tests repo
|
# Install git so that we can clone the tests repo if git is not available
|
||||||
eval sudo $pkg_mgr_cmd git
|
which git &>/dev/null || eval sudo "${pkg_mgr_cmd}" git
|
||||||
|
|
||||||
# Clone the tests repo for access to the common test script
|
# Clone the tests repo for access to the common test script
|
||||||
if [[ ! -d ${COMMON_TESTS_PATH} ]]; then
|
if [[ ! -d "${COMMON_TESTS_PATH}" ]]; then
|
||||||
# The tests repo doesn't need a clone, we can just
|
# The tests repo doesn't need a clone, we can just
|
||||||
# symlink it.
|
# symlink it.
|
||||||
if [[ "$(basename ${WORKING_DIR})" == "openstack-ansible-tests" ]]; then
|
if [[ "$(basename ${WORKING_DIR})" == "openstack-ansible-tests" ]]; then
|
||||||
ln -s ${WORKING_DIR} ${COMMON_TESTS_PATH}
|
ln -s "${WORKING_DIR}" "${COMMON_TESTS_PATH}"
|
||||||
|
|
||||||
# In zuul v3 any dependent repository is placed into
|
# In zuul v3 any dependent repository is placed into
|
||||||
# /home/zuul/src/git.openstack.org, so we check to see
|
# /home/zuul/src/git.openstack.org, so we check to see
|
||||||
# if there is a tests checkout there already. If so, we
|
# if there is a tests checkout there already. If so, we
|
||||||
# symlink that and use it.
|
# symlink that and use it.
|
||||||
elif [[ -d "${ZUUL_TESTS_CLONE_LOCATION}" ]]; then
|
elif [[ -d "${ZUUL_TESTS_CLONE_LOCATION}" ]]; then
|
||||||
ln -s "${ZUUL_TESTS_CLONE_LOCATION}" ${COMMON_TESTS_PATH}
|
ln -s "${ZUUL_TESTS_CLONE_LOCATION}" "${COMMON_TESTS_PATH}"
|
||||||
|
|
||||||
# Otherwise we're clearly not in zuul or using a previously setup
|
# Otherwise we're clearly not in zuul or using a previously setup
|
||||||
# repo in some way, so just clone it from upstream.
|
# repo in some way, so just clone it from upstream.
|
||||||
else
|
else
|
||||||
git clone -b ${TESTING_BRANCH} \
|
git clone -b "${TESTING_BRANCH}" \
|
||||||
https://git.openstack.org/openstack/openstack-ansible-tests \
|
https://git.openstack.org/openstack/openstack-ansible-tests \
|
||||||
${COMMON_TESTS_PATH}
|
"${COMMON_TESTS_PATH}"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user