Browse code
[stable-2.10] Drop "rhui-" prefix from RHEL repositories in AMI (#71130) (#71131)
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>
Sam Doran authored on 2020/08/07 06:58:58Showing 2 changed files
- test/integration/targets/incidental_setup_docker/tasks/RedHat-7.yml
- test/integration/targets/yum/tasks/yuminstallroot.yml
| ... | ... |
@@ -12,8 +12,8 @@ |
| 12 | 12 |
name: setup_epel |
| 13 | 13 |
|
| 14 | 14 |
- name: Enable extras repository for RHEL on AWS |
| 15 |
- # RHEL 7.6 uses rhui-REGION-rhel-server-extras and RHEL 7.7+ use rhui-rhel-7-server-rhui-extras-rpms |
|
| 16 |
- command: yum-config-manager --enable rhui-REGION-rhel-server-extras rhui-rhel-7-server-rhui-extras-rpms |
|
| 15 |
+ # RHEL 7.6 uses REGION-rhel-server-extras and RHEL 7.7+ use rhel-7-server-rhui-extras-rpms |
|
| 16 |
+ command: yum-config-manager --enable REGION-rhel-server-extras rhel-7-server-rhui-extras-rpms |
|
| 17 | 17 |
args: |
| 18 | 18 |
warn: no |
| 19 | 19 |
|
| ... | ... |
@@ -78,8 +78,8 @@ |
| 78 | 78 |
block: |
| 79 | 79 |
# Need to enable this RHUI repo for RHEL7 testing in AWS, CentOS has Extras |
| 80 | 80 |
# enabled by default and this is not needed there. |
| 81 |
- - name: enable rhui-rhel-7-server-rhui-extras-rpms repo for RHEL7 |
|
| 82 |
- command: yum-config-manager --enable rhui-rhel-7-server-rhui-extras-rpms |
|
| 81 |
+ - name: enable rhel-7-server-rhui-extras-rpms repo for RHEL7 |
|
| 82 |
+ command: yum-config-manager --enable rhel-7-server-rhui-extras-rpms |
|
| 83 | 83 |
- name: update cache to pull repodata |
| 84 | 84 |
yum: |
| 85 | 85 |
update_cache: yes |
| ... | ... |
@@ -118,5 +118,5 @@ |
| 118 | 118 |
state: absent |
| 119 | 119 |
name: |
| 120 | 120 |
- buildah |
| 121 |
- - name: disable rhui-rhel-7-server-rhui-extras-rpms repo for RHEL7 |
|
| 122 |
- command: yum-config-manager --disable rhui-rhel-7-server-rhui-extras-rpms |
|
| 121 |
+ - name: disable rhel-7-server-rhui-extras-rpms repo for RHEL7 |
|
| 122 |
+ command: yum-config-manager --disable rhel-7-server-rhui-extras-rpms |