diff --git a/jenkins/jobs/ara.yaml b/jenkins/jobs/ara.yaml index 9d56dd1ffe..950187cf18 100644 --- a/jenkins/jobs/ara.yaml +++ b/jenkins/jobs/ara.yaml @@ -64,14 +64,21 @@ template-name: "{template-name}" - openstack-ansible-tests-checkout - shell: | - # EPEL must be enabled because some deps from bindep.txt are - # otherwise not available - if [[ -e /usr/bin/yum ]]; then - sudo yum-config-manager --enable epel + # NOTE(mhayden): The CentOS CI image has many repositories enabled by + # default that can cause package conflicts. We must disable all of + # them here and only enable base, updates, and epel. + if [[ -e /usr/bin/yum ]] && [[ -x /usr/bin/yum-config-manager ]]; then + sudo yum-config-manager --disable \* + sudo yum-config-manager --enable base + sudo yum-config-manager --enable epel + sudo yum-config-manager --enable updates fi - install-distro-packages - shell: | - if [[ -e /usr/bin/yum ]]; then + # NOTE(mhayden): EPEL is no longer required after installing distro + # packages with bindep. Individual roles may re-enable EPEL if they + # need it for their package installation tasks. + if [[ -e /usr/bin/yum ]] && [[ -x /usr/bin/yum-config-manager ]]; then sudo yum-config-manager --disable epel fi - shell: |