From b95e520602aea06f7f353a01e7fb4e458d9c3a01 Mon Sep 17 00:00:00 2001 From: Sam Doran Date: Thu, 6 Aug 2020 19:17:52 -0400 Subject: [PATCH] [stable-2.8] Drop "rhui-" prefix from RHEL repositories in AMI (#71130) (#71133) 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 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/integration/targets/setup_docker/tasks/RedHat-7.yml b/test/integration/targets/setup_docker/tasks/RedHat-7.yml index 94c66b8d40ab11..57d42264f7cd3d 100644 --- a/test/integration/targets/setup_docker/tasks/RedHat-7.yml +++ b/test/integration/targets/setup_docker/tasks/RedHat-7.yml @@ -11,8 +11,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 b42f8e0ad90322..789662779a7ca2 100644 --- a/test/integration/targets/setup_podman/vars/main.yml +++ b/test/integration/targets/setup_podman/vars/main.yml @@ -1,2 +1,2 @@ repo_command: - RedHat7: yum-config-manager --enable rhui-REGION-rhel-server-extras + RedHat7: yum-config-manager --enable REGION-rhel-server-extras