From 75646037dc3b927a33912fd968a1864920115c6e Mon Sep 17 00:00:00 2001
From: Matt Clay <matt@mystile.com>
Date: Wed, 6 Nov 2019 07:59:51 -0800
Subject: [PATCH] Switch from RHEL 8.0 & 8.1b to 8.1 in CI.

---
 .../fragments/ansible-test-rhel-8.1-testing.yml      |  2 ++
 shippable.yml                                        | 12 ++++--------
 test/lib/ansible_test/_data/completion/remote.txt    |  3 +--
 3 files changed, 7 insertions(+), 10 deletions(-)
 create mode 100644 changelogs/fragments/ansible-test-rhel-8.1-testing.yml

diff --git a/changelogs/fragments/ansible-test-rhel-8.1-testing.yml b/changelogs/fragments/ansible-test-rhel-8.1-testing.yml
new file mode 100644
index 00000000000..6eadfc20936
--- /dev/null
+++ b/changelogs/fragments/ansible-test-rhel-8.1-testing.yml
@@ -0,0 +1,2 @@
+minor_changes:
+    - ansible-test - switch from testing RHEL 8.0 and RHEL 8.1 Beta to RHEL 8.1
diff --git a/shippable.yml b/shippable.yml
index 5c26ad07925..2eb7139a296 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -81,8 +81,7 @@ matrix:
 
     - env: T=osx/10.11/1
     - env: T=rhel/7.6/1
-    - env: T=rhel/8.0/1
-    - env: T=rhel/8.1b/1
+    - env: T=rhel/8.1/1
     - env: T=freebsd/11.1/1
     - env: T=freebsd/12.0/1
     - env: T=linux/centos6/1
@@ -96,8 +95,7 @@ matrix:
 
     - env: T=osx/10.11/2
     - env: T=rhel/7.6/2
-    - env: T=rhel/8.0/2
-    - env: T=rhel/8.1b/2
+    - env: T=rhel/8.1/2
     - env: T=freebsd/11.1/2
     - env: T=freebsd/12.0/2
     - env: T=linux/centos6/2
@@ -111,8 +109,7 @@ matrix:
 
     - env: T=osx/10.11/3
     - env: T=rhel/7.6/3
-    - env: T=rhel/8.0/3
-    - env: T=rhel/8.1b/3
+    - env: T=rhel/8.1/3
     - env: T=freebsd/11.1/3
     - env: T=freebsd/12.0/3
     - env: T=linux/centos6/3
@@ -126,8 +123,7 @@ matrix:
 
     - env: T=osx/10.11/4
     - env: T=rhel/7.6/4
-    - env: T=rhel/8.0/4
-    - env: T=rhel/8.1b/4
+    - env: T=rhel/8.1/4
     - env: T=freebsd/11.1/4
     - env: T=freebsd/12.0/4
     - env: T=linux/centos6/4
diff --git a/test/lib/ansible_test/_data/completion/remote.txt b/test/lib/ansible_test/_data/completion/remote.txt
index 0ad0ac70e81..1d553d409f6 100644
--- a/test/lib/ansible_test/_data/completion/remote.txt
+++ b/test/lib/ansible_test/_data/completion/remote.txt
@@ -2,5 +2,4 @@ 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/8.0 python=3.6
-rhel/8.1b python=3.6
+rhel/8.1 python=3.6