Updated from OpenStack Ansible Tests
Change-Id: I4ed7811f9037a1c194abb67cf867559f97a76df3
This commit is contained in:
parent
b1b50a05d8
commit
d0ea8e9b01
20
run_tests.sh
20
run_tests.sh
|
@ -49,24 +49,12 @@ install_pkg_deps() {
|
||||||
eval sudo $pkg_mgr_cmd $pkg_deps
|
eval sudo $pkg_mgr_cmd $pkg_deps
|
||||||
}
|
}
|
||||||
|
|
||||||
git_clone_repo() {
|
# Install the host distro package dependencies
|
||||||
if [[ ! -d tests/common ]]; then
|
|
||||||
# The tests repo doesn't need a clone, we can just
|
|
||||||
# symlink it.
|
|
||||||
if [[ "$(basename ${WORKING_DIR})" == "openstack-ansible-tests" ]]; then
|
|
||||||
ln -s ${WORKING_DIR} ${WORKING_DIR}/tests/common
|
|
||||||
else
|
|
||||||
git clone -b stable/pike \
|
|
||||||
https://git.openstack.org/openstack/openstack-ansible-tests \
|
|
||||||
tests/common
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
install_pkg_deps
|
install_pkg_deps
|
||||||
|
|
||||||
git_clone_repo
|
# Clone the tests repo for access to the common test script
|
||||||
|
source tests/tests-repo-clone.sh
|
||||||
|
|
||||||
# start executing the main test script
|
# Execute the common test script
|
||||||
source tests/common/run_tests_common.sh
|
source tests/common/run_tests_common.sh
|
||||||
|
|
||||||
|
|
|
@ -33,6 +33,7 @@ set -e
|
||||||
export TESTING_HOME=${TESTING_HOME:-$HOME}
|
export TESTING_HOME=${TESTING_HOME:-$HOME}
|
||||||
export WORKING_DIR=${WORKING_DIR:-$(pwd)}
|
export WORKING_DIR=${WORKING_DIR:-$(pwd)}
|
||||||
export CLONE_UPGRADE_TESTS=${CLONE_UPGRADE_TESTS:-no}
|
export CLONE_UPGRADE_TESTS=${CLONE_UPGRADE_TESTS:-no}
|
||||||
|
export ZUUL_TESTS_CLONE_LOCATION="/home/zuul/src/git.openstack.org/openstack/openstack-ansible-tests"
|
||||||
|
|
||||||
## Functions -----------------------------------------------------------------
|
## Functions -----------------------------------------------------------------
|
||||||
|
|
||||||
|
@ -52,7 +53,11 @@ EOF
|
||||||
# If zuul-cloner is present, use it so that we
|
# If zuul-cloner is present, use it so that we
|
||||||
# also include any dependent patches from the
|
# also include any dependent patches from the
|
||||||
# tests repo noted in the commit message.
|
# tests repo noted in the commit message.
|
||||||
if [[ -x /usr/zuul-env/bin/zuul-cloner ]]; then
|
# We only want to use zuul-cloner if we detect
|
||||||
|
# zuul v2 running, so we check for the presence
|
||||||
|
# of the ZUUL_REF environment variable.
|
||||||
|
# ref: http://git.openstack.org/cgit/openstack-infra/zuul/tree/zuul/ansible/filter/zuul_filters.py?h=feature/zuulv3#n17
|
||||||
|
if [[ -x /usr/zuul-env/bin/zuul-cloner ]] && [[ "${ZUUL_REF:-none}" != "none" ]]; then
|
||||||
|
|
||||||
# Prepare the clonemap for zuul-cloner to use
|
# Prepare the clonemap for zuul-cloner to use
|
||||||
create_tests_clonemap
|
create_tests_clonemap
|
||||||
|
@ -74,9 +79,22 @@ if [[ -x /usr/zuul-env/bin/zuul-cloner ]]; then
|
||||||
elif [[ ! -d tests/common ]]; then
|
elif [[ ! -d tests/common ]]; 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. As zuul v3 clones into a folder called
|
||||||
if [[ "$(basename ${WORKING_DIR})" == "openstack-ansible-tests" ]]; then
|
# 'workspace' we have to use one of its environment
|
||||||
|
# variables to determine the project name.
|
||||||
|
if [[ "${ZUUL_SHORT_PROJECT_NAME:-none}" == "openstack-ansible-tests" ]] ||\
|
||||||
|
[[ "$(basename ${WORKING_DIR})" == "openstack-ansible-tests" ]]; then
|
||||||
ln -s ${WORKING_DIR} ${WORKING_DIR}/tests/common
|
ln -s ${WORKING_DIR} ${WORKING_DIR}/tests/common
|
||||||
|
|
||||||
|
# In zuul v3 any dependent repository is placed into
|
||||||
|
# /home/zuul/src/git.openstack.org, so we check to see
|
||||||
|
# if there is a tests checkout there already. If so, we
|
||||||
|
# symlink that and use it.
|
||||||
|
elif [[ -d "${ZUUL_TESTS_CLONE_LOCATION}" ]]; then
|
||||||
|
ln -s "${ZUUL_TESTS_CLONE_LOCATION}" ${WORKING_DIR}/tests/common
|
||||||
|
|
||||||
|
# Otherwise we're clearly not in zuul or using a previously setup
|
||||||
|
# repo in some way, so just clone it from upstream.
|
||||||
else
|
else
|
||||||
git clone -b stable/pike \
|
git clone -b stable/pike \
|
||||||
https://git.openstack.org/openstack/openstack-ansible-tests \
|
https://git.openstack.org/openstack/openstack-ansible-tests \
|
||||||
|
@ -92,7 +110,7 @@ fi
|
||||||
# tests repo are not supported.
|
# tests repo are not supported.
|
||||||
if [[ "${CLONE_UPGRADE_TESTS}" == "yes" ]]; then
|
if [[ "${CLONE_UPGRADE_TESTS}" == "yes" ]]; then
|
||||||
if [[ ! -d "${WORKING_DIR}/tests/common/previous" ]]; then
|
if [[ ! -d "${WORKING_DIR}/tests/common/previous" ]]; then
|
||||||
git clone -b stable/pike \
|
git clone -b stable/ocata \
|
||||||
https://git.openstack.org/openstack/openstack-ansible-tests \
|
https://git.openstack.org/openstack/openstack-ansible-tests \
|
||||||
${WORKING_DIR}/tests/common/previous
|
${WORKING_DIR}/tests/common/previous
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue