Drop "rhui-" prefix from RHEL repositories in AMI (ansible#71130)

The repository names seem to have changed and no longer have the "rhui-" prefix
zoredache · Aug 10, 2020 · 8eabd55 · 8eabd55
1 parent 3a62af8
commit 8eabd55
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 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
@@ -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
@@ -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