cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[stable-2.10] Drop "rhui-" prefix from RHEL repositories in AMI (#71130) (#71131)

Browse source 
The repository names seem to have changed and no longer have the "rhui-" prefix
(cherry picked from commit 6ac4439a6a)

Co-authored-by: Sam Doran <sdoran@redhat.com>
This commit is contained in:
Sam Doran 2020-08-06 17:58:58 -04:00 committed by GitHub
parent 3e7e3ee352
commit be5aab177c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/integration/targets/incidental_setup_docker/tasks/RedHat-7.yml
View file

@ -12,8 +12,8 @@
name: setup_epel name: setup_epel
- name: Enable extras repository for RHEL on AWS - name: Enable extras repository for RHEL on AWS
# RHEL 7.6 uses rhui-REGION-rhel-server-extras and RHEL 7.7+ use rhui-rhel-7-server-rhui-extras-rpms # RHEL 7.6 uses REGION-rhel-server-extras and RHEL 7.7+ use rhel-7-server-rhui-extras-rpms
command: yum-config-manager --enable rhui-REGION-rhel-server-extras rhui-rhel-7-server-rhui-extras-rpms command: yum-config-manager --enable REGION-rhel-server-extras rhel-7-server-rhui-extras-rpms
args: args:
warn: no warn: no

8
test/integration/targets/yum/tasks/yuminstallroot.yml
View file

@ -78,8 +78,8 @@
block: block:
# Need to enable this RHUI repo for RHEL7 testing in AWS, CentOS has Extras # Need to enable this RHUI repo for RHEL7 testing in AWS, CentOS has Extras
# enabled by default and this is not needed there. # enabled by default and this is not needed there.
- name: enable rhui-rhel-7-server-rhui-extras-rpms repo for RHEL7 - name: enable rhel-7-server-rhui-extras-rpms repo for RHEL7
command: yum-config-manager --enable rhui-rhel-7-server-rhui-extras-rpms command: yum-config-manager --enable rhel-7-server-rhui-extras-rpms
- name: update cache to pull repodata - name: update cache to pull repodata
yum: yum:
update_cache: yes update_cache: yes
@ -118,5 +118,5 @@
state: absent state: absent
name: name:
- buildah - buildah
- name: disable rhui-rhel-7-server-rhui-extras-rpms repo for RHEL7 - name: disable rhel-7-server-rhui-extras-rpms repo for RHEL7
command: yum-config-manager --disable rhui-rhel-7-server-rhui-extras-rpms command: yum-config-manager --disable rhel-7-server-rhui-extras-rpms