diff options
| author | Matt Clay <matt@mystile.com> | 2023-01-04 14:40:34 -0800 |
|---|---|---|
| committer | Matt Clay <matt@mystile.com> | 2023-01-04 17:52:59 -0800 |
| commit | a76adbccca48b66421520cc493328832a41240df (patch) | |
| tree | 20a1a8efdae493c38bb58467b16debd937957b7b | |
| parent | 9e3363f8b7debb4ba8603488bc01f1942fa29381 (diff) | |
| download | ansible-a76adbccca48b66421520cc493328832a41240df.tar.gz | |
[stable-2.13] Fix EPEL setup for integration tests on RHEL 7
(cherry picked from commit 1243d2ace0aa6dc609369dafee7ad52cf9aa26ef)
Co-authored-by: Matt Clay <matt@mystile.com>
| -rw-r--r-- | test/integration/targets/setup_epel/tasks/main.yml | 5 | ||||
| -rw-r--r-- | test/integration/targets/yum/tasks/yuminstallroot.yml | 9 |
2 files changed, 5 insertions, 9 deletions
diff --git a/test/integration/targets/setup_epel/tasks/main.yml b/test/integration/targets/setup_epel/tasks/main.yml index ba0eae3093..a8593bb4fe 100644 --- a/test/integration/targets/setup_epel/tasks/main.yml +++ b/test/integration/targets/setup_epel/tasks/main.yml @@ -1,3 +1,8 @@ +- name: Enable RHEL7 extras + # EPEL 7 depends on RHEL 7 extras, which is not enabled by default on RHEL. + # See: https://docs.fedoraproject.org/en-US/epel/epel-policy/#_policy + command: yum-config-manager --enable rhel-7-server-rhui-extras-rpms + when: ansible_facts.distribution == 'RedHat' and ansible_facts.distribution_major_version == '7' - name: Install EPEL yum: name: https://ci-files.testing.ansible.com/test/integration/targets/setup_epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm diff --git a/test/integration/targets/yum/tasks/yuminstallroot.yml b/test/integration/targets/yum/tasks/yuminstallroot.yml index bb69151ad7..028e805947 100644 --- a/test/integration/targets/yum/tasks/yuminstallroot.yml +++ b/test/integration/targets/yum/tasks/yuminstallroot.yml @@ -76,13 +76,6 @@ - ansible_facts["distribution_major_version"] == "7" - ansible_facts["distribution"] == "RedHat" block: - # Need to enable this RHUI repo for RHEL7 testing in AWS, CentOS has Extras - # enabled by default and this is not needed there. - - name: enable rhel-7-server-rhui-extras-rpms repo for RHEL7 - command: yum-config-manager --enable rhel-7-server-rhui-extras-rpms - - name: update cache to pull repodata - yum: - update_cache: yes - name: install required packages for buildah test yum: state: present @@ -137,5 +130,3 @@ state: absent name: - buildah - - name: disable rhel-7-server-rhui-extras-rpms repo for RHEL7 - command: yum-config-manager --disable rhel-7-server-rhui-extras-rpms |