diff --git a/run_tests_common.sh b/run_tests_common.sh index 8a6c5f01..db3a659f 100755 --- a/run_tests_common.sh +++ b/run_tests_common.sh @@ -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 diff --git a/test-ansible-functional.sh b/test-ansible-functional.sh index f12c37c6..0ebb42ec 100755 --- a/test-ansible-functional.sh +++ b/test-ansible-functional.sh @@ -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