From be5aab177cde35e872ff6277e0458eb6d2d94dde Mon Sep 17 00:00:00 2001 From: Sam Doran Date: Thu, 6 Aug 2020 17:58:58 -0400 Subject: [PATCH] [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 --- .../targets/incidental_setup_docker/tasks/RedHat-7.yml | 4 ++-- test/integration/targets/yum/tasks/yuminstallroot.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/integration/targets/incidental_setup_docker/tasks/RedHat-7.yml b/test/integration/targets/incidental_setup_docker/tasks/RedHat-7.yml index c54302c68d9..e35b2c74565 100644 --- a/test/integration/targets/incidental_setup_docker/tasks/RedHat-7.yml +++ b/test/integration/targets/incidental_setup_docker/tasks/RedHat-7.yml @@ -12,8 +12,8 @@ name: setup_epel - 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 - command: yum-config-manager --enable rhui-REGION-rhel-server-extras 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 REGION-rhel-server-extras rhel-7-server-rhui-extras-rpms args: warn: no diff --git a/test/integration/targets/yum/tasks/yuminstallroot.yml b/test/integration/targets/yum/tasks/yuminstallroot.yml index 2a6bd3f8044..f9bee6f9ae9 100644 --- a/test/integration/targets/yum/tasks/yuminstallroot.yml +++ b/test/integration/targets/yum/tasks/yuminstallroot.yml @@ -78,8 +78,8 @@ 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 rhui-rhel-7-server-rhui-extras-rpms repo for RHEL7 - command: yum-config-manager --enable rhui-rhel-7-server-rhui-extras-rpms + - 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 @@ -118,5 +118,5 @@ state: absent name: - buildah - - name: disable rhui-rhel-7-server-rhui-extras-rpms repo for RHEL7 - command: yum-config-manager --disable rhui-rhel-7-server-rhui-extras-rpms + - name: disable rhel-7-server-rhui-extras-rpms repo for RHEL7 + command: yum-config-manager --disable rhel-7-server-rhui-extras-rpms