Updated from OpenStack Ansible Tests
Change-Id: I8467e73b522fb12bb84a4f2bad517b5af1305c76
This commit is contained in:
parent
cbfd8758c7
commit
80555b3852
|
@ -23,7 +23,7 @@
|
|||
#
|
||||
|
||||
# Base requirements for Ubuntu
|
||||
build-essential [platform:dpkg]
|
||||
gcc [platform:dpkg]
|
||||
git-core [platform:dpkg]
|
||||
libssl-dev [platform:dpkg]
|
||||
libffi-dev [platform:dpkg]
|
||||
|
@ -54,8 +54,7 @@ python-pyasn1 [platform:dpkg platform:suse]
|
|||
python-openssl [platform:dpkg]
|
||||
python-ndg-httpsclient [platform:ubuntu !platform:ubuntu-14]
|
||||
python2-pyasn1 [platform:redhat]
|
||||
python2-pyOpenSSL [platform:redhat !platform:fedora]
|
||||
pyOpenSSL [platform:fedora]
|
||||
pyOpenSSL [platform:redhat]
|
||||
python-pyOpenSSL [platform:opensuseproject-42]
|
||||
python2-pyOpenSSL [platform:suse !platform:opensuseproject-42]
|
||||
python-ndg_httpsclient [platform:redhat !platform:fedora]
|
||||
|
|
|
@ -35,9 +35,12 @@ source /etc/os-release || source /usr/lib/os-release
|
|||
install_pkg_deps() {
|
||||
pkg_deps="git"
|
||||
|
||||
# Prefer dnf over yum for CentOS.
|
||||
which dnf &>/dev/null && RHT_PKG_MGR='dnf' || RHT_PKG_MGR='yum'
|
||||
|
||||
case ${ID,,} in
|
||||
*suse*) pkg_mgr_cmd="zypper -n in" ;;
|
||||
centos|rhel) pkg_mgr_cmd="yum install -y" ;;
|
||||
centos|rhel) pkg_mgr_cmd="${RHT_PKG_MGR} install -y" ;;
|
||||
fedora) pkg_mgr_cmd="dnf -y install" ;;
|
||||
ubuntu|debian) pkg_mgr_cmd="apt-get install -y" ;;
|
||||
*) echo "unsupported distribution: ${ID,,}"; exit 1 ;;
|
||||
|
@ -53,7 +56,7 @@ git_clone_repo() {
|
|||
if [[ "$(basename ${WORKING_DIR})" == "openstack-ansible-tests" ]]; then
|
||||
ln -s ${WORKING_DIR} ${WORKING_DIR}/tests/common
|
||||
else
|
||||
git clone \
|
||||
git clone -b stable/pike \
|
||||
https://git.openstack.org/openstack/openstack-ansible-tests \
|
||||
tests/common
|
||||
fi
|
||||
|
|
|
@ -78,7 +78,7 @@ elif [[ ! -d tests/common ]]; then
|
|||
if [[ "$(basename ${WORKING_DIR})" == "openstack-ansible-tests" ]]; then
|
||||
ln -s ${WORKING_DIR} ${WORKING_DIR}/tests/common
|
||||
else
|
||||
git clone \
|
||||
git clone -b stable/pike \
|
||||
https://git.openstack.org/openstack/openstack-ansible-tests \
|
||||
${WORKING_DIR}/tests/common
|
||||
fi
|
||||
|
@ -92,7 +92,7 @@ fi
|
|||
# tests repo are not supported.
|
||||
if [[ "${CLONE_UPGRADE_TESTS}" == "yes" ]]; then
|
||||
if [[ ! -d "${WORKING_DIR}/tests/common/previous" ]]; then
|
||||
git clone -b stable/ocata \
|
||||
git clone -b stable/pike \
|
||||
https://git.openstack.org/openstack/openstack-ansible-tests \
|
||||
${WORKING_DIR}/tests/common/previous
|
||||
fi
|
||||
|
|
Loading…
Reference in New Issue