From 813a3d51a55705b719c8c02378ade603593f4f04 Mon Sep 17 00:00:00 2001 From: Sam Doran Date: Thu, 6 Aug 2020 17:07:35 -0400 Subject: [PATCH] [stable-2.9] Drop "rhui-" prefix from RHEL repositories in AMI (#71130) The repository names seem to have changed and no longer have the "rhui-" prefix. (cherry picked from commit 6ac4439a6abe8c87190d25d6ee53962c03b458a1) Co-authored-by: Sam Doran --- test/integration/targets/setup_docker/tasks/RedHat-7.yml | 4 ++-- test/integration/targets/setup_podman/vars/main.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/integration/targets/setup_docker/tasks/RedHat-7.yml b/test/integration/targets/setup_docker/tasks/RedHat-7.yml index c54302c68d9ebb..e35b2c745651d8 100644 --- a/test/integration/targets/setup_docker/tasks/RedHat-7.yml +++ b/test/integration/targets/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/setup_podman/vars/main.yml b/test/integration/targets/setup_podman/vars/main.yml index 2b814b74299b3e..c0d3bc25455400 100644 --- a/test/integration/targets/setup_podman/vars/main.yml +++ b/test/integration/targets/setup_podman/vars/main.yml @@ -1,4 +1,4 @@ repo_command: RedHat7: - enable: yum-config-manager --enable rhui-REGION-rhel-server-extras rhui-rhel-7-server-rhui-extras-rpms - disable: yum-config-manager --disable rhui-REGION-rhel-server-extras rhui-rhel-7-server-rhui-extras-rpms + enable: yum-config-manager --enable REGION-rhel-server-extras rhui-rhel-7-server-rhui-extras-rpms + disable: yum-config-manager --disable REGION-rhel-server-extras rhui-rhel-7-server-rhui-extras-rpms