From 8a14392a293bec41fa52fdfa210211bb38af4130 Mon Sep 17 00:00:00 2001
From: Matt Clay <mclay@redhat.com>
Date: Wed, 8 Apr 2020 21:09:52 -0700
Subject: [PATCH] [stable-2.9] Update tests to use RHEL 7.8. (#68787)

* Update tests to use RHEL 7.8.

Keeping support for RHEL 7.6 since collections are still using it.

* Fix tests for RHEL 7.7+ due to extras repo name change..
(cherry picked from commit 04edd77c4273b321867c0f08d6ff2b67dacfcf2d)

Co-authored-by: Matt Clay <mclay@redhat.com>
---
 changelogs/fragments/ansible-test-rhel-7.8.yml           | 2 ++
 shippable.yml                                            | 8 ++++----
 test/integration/targets/setup_docker/tasks/RedHat-7.yml | 3 ++-
 test/lib/ansible_test/_data/completion/remote.txt        | 1 +
 4 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 changelogs/fragments/ansible-test-rhel-7.8.yml

diff --git a/changelogs/fragments/ansible-test-rhel-7.8.yml b/changelogs/fragments/ansible-test-rhel-7.8.yml
new file mode 100644
index 00000000000..39ef06ef5e7
--- /dev/null
+++ b/changelogs/fragments/ansible-test-rhel-7.8.yml
@@ -0,0 +1,2 @@
+minor_changes:
+    - ansible-test now supports testing against RHEL 7.8 when using the ``--remote`` option.
diff --git a/shippable.yml b/shippable.yml
index e1ef5fa5210..a376565a078 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -66,7 +66,7 @@ matrix:
     - env: T=network
 
     - env: T=osx/10.11/1
-    - env: T=rhel/7.6/1
+    - env: T=rhel/7.8/1
     - env: T=rhel/8.1/1
     - env: T=freebsd/11.1/1
     - env: T=freebsd/12.0/1
@@ -80,7 +80,7 @@ matrix:
     - env: T=linux/ubuntu1804/1
 
     - env: T=osx/10.11/2
-    - env: T=rhel/7.6/2
+    - env: T=rhel/7.8/2
     - env: T=rhel/8.1/2
     - env: T=freebsd/11.1/2
     - env: T=freebsd/12.0/2
@@ -94,7 +94,7 @@ matrix:
     - env: T=linux/ubuntu1804/2
 
     - env: T=osx/10.11/3
-    - env: T=rhel/7.6/3
+    - env: T=rhel/7.8/3
     - env: T=rhel/8.1/3
     - env: T=freebsd/11.1/3
     - env: T=freebsd/12.0/3
@@ -108,7 +108,7 @@ matrix:
     - env: T=linux/ubuntu1804/3
 
     - env: T=osx/10.11/4
-    - env: T=rhel/7.6/4
+    - env: T=rhel/7.8/4
     - env: T=rhel/8.1/4
     - env: T=freebsd/11.1/4
     - env: T=freebsd/12.0/4
diff --git a/test/integration/targets/setup_docker/tasks/RedHat-7.yml b/test/integration/targets/setup_docker/tasks/RedHat-7.yml
index cacc708dc85..c54302c68d9 100644
--- a/test/integration/targets/setup_docker/tasks/RedHat-7.yml
+++ b/test/integration/targets/setup_docker/tasks/RedHat-7.yml
@@ -12,7 +12,8 @@
     name: setup_epel
 
 - name: Enable extras repository for RHEL on AWS
-  command: yum-config-manager --enable rhui-REGION-rhel-server-extras
+  # 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
   args:
     warn: no
 
diff --git a/test/lib/ansible_test/_data/completion/remote.txt b/test/lib/ansible_test/_data/completion/remote.txt
index 1d553d409f6..1e3af888f59 100644
--- a/test/lib/ansible_test/_data/completion/remote.txt
+++ b/test/lib/ansible_test/_data/completion/remote.txt
@@ -2,4 +2,5 @@ freebsd/11.1 python=2.7,3.6 python_dir=/usr/local/bin
 freebsd/12.0 python=3.6,2.7 python_dir=/usr/local/bin
 osx/10.11 python=2.7 python_dir=/usr/local/bin
 rhel/7.6 python=2.7
+rhel/7.8 python=2.7
 rhel/8.1 python=3.6