openstack
/
openstack-ansible-tests
Code Issues Proposed changes

Remove dependency on EPEL 

The EPEL repositories currently conflict with the RDO packages,
this commit drops it from openstack_hosts so new installs do not
get it.

Change-Id: I25d585c25d2b7a3e8bbf3d96060050f3426ed4a7
This commit is contained in:
Mohammed Naser 2018-06-07 13:59:05 -04:00
parent d95da1cd43
commit 2edd1d1c6e
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
run_tests_common.sh
View File

@ -68,7 +68,7 @@ case "${ID,,}" in
pkg_list="ca-certificates-mozilla python-devel python-xml lsb-release ${extra_suse_deps:-}"
;;
amzn|centos|rhel)
pkg_list="python-devel redhat-lsb-core epel-release yum-utils"
pkg_list="python-devel redhat-lsb-core yum-utils"
;;
fedora)
pkg_list="python-devel redhat-lsb-core redhat-rpm-config yum-utils"
@ -96,11 +96,7 @@ fi
# Install bindep and tox
sudo pip install 'bindep>=2.4.0' tox
if [[ "${ID,,}" == "centos" ]]; then
# epel-release could be installed but not enabled (which is very common
# in openstack-ci) so enable it here if needed
sudo yum-config-manager --enable epel > /dev/null || true
elif [[ "${ID,,}" == "fedora" ]]; then
if [[ "${ID,,}" == "fedora" ]]; then
sudo dnf -y install redhat-lsb-core yum-utils
# openSUSE 42.1 does not have python-ndg-httpsclient
elif [[ "${ID,,}" == *suse* ]] && [[ ${VERSION} == "42.1" ]]; then

3
test-ansible-functional.sh
View File

@ -75,12 +75,11 @@ function execute_ansible_playbook {
## Main ----------------------------------------------------------------------
# NOTE(mhayden): CentOS images in the gate have several slow mirrors enabled
# by default. This step ensures that only the base, epel, and updates
# by default. This step ensures that only the base and updates
# repositories are enabled.
if [[ -x /usr/bin/yum-config-manager ]] && [[ -e /etc/centos-release ]]; then
sudo yum-config-manager --disable \* > /dev/null
sudo yum-config-manager --enable base > /dev/null
sudo yum-config-manager --enable epel > /dev/null
sudo yum-config-manager --enable updates > /dev/null
fi