From 84075fe3512c967b70408ec84b0c94aed1c9bab4 Mon Sep 17 00:00:00 2001
From: Sam Doran <sdoran@redhat.com>
Date: Fri, 14 Jun 2019 16:47:27 -0400
Subject: [PATCH] Change RHEL8 image name to match changes in ansible-test
 (#57807)

* Change RHEL8 image name to match changes in ansible-test

Continue to use the beta version of RHEL 8 until we fix tests that are breaking with the GA version.

* Skip ufw integration test on RHEL 8 Beta
---
 shippable.yml                        | 8 ++++----
 test/integration/targets/ufw/aliases | 1 +
 test/runner/completion/remote.txt    | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/shippable.yml b/shippable.yml
index f84a5f8cf23..06f03c44b04 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -66,7 +66,7 @@ matrix:
 
     - env: T=osx/10.11/1
     - env: T=rhel/7.6/1
-    - env: T=rhel/8.0/1
+    - env: T=rhel/8.0b/1
     - env: T=freebsd/11.1/1
     - env: T=freebsd/12.0/1
     - env: T=linux/centos6/1
@@ -80,7 +80,7 @@ matrix:
 
     - env: T=osx/10.11/2
     - env: T=rhel/7.6/2
-    - env: T=rhel/8.0/2
+    - env: T=rhel/8.0b/2
     - env: T=freebsd/11.1/2
     - env: T=freebsd/12.0/2
     - env: T=linux/centos6/2
@@ -94,7 +94,7 @@ matrix:
 
     - env: T=osx/10.11/3
     - env: T=rhel/7.6/3
-    - env: T=rhel/8.0/3
+    - env: T=rhel/8.0b/3
     - env: T=freebsd/11.1/3
     - env: T=freebsd/12.0/3
     - env: T=linux/centos6/3
@@ -108,7 +108,7 @@ matrix:
 
     - env: T=osx/10.11/4
     - env: T=rhel/7.6/4
-    - env: T=rhel/8.0/4
+    - env: T=rhel/8.0b/4
     - env: T=freebsd/11.1/4
     - env: T=freebsd/12.0/4
     - env: T=linux/centos6/4
diff --git a/test/integration/targets/ufw/aliases b/test/integration/targets/ufw/aliases
index 1d8e00af434..b0dc331f056 100644
--- a/test/integration/targets/ufw/aliases
+++ b/test/integration/targets/ufw/aliases
@@ -2,6 +2,7 @@ shippable/posix/group2
 skip/osx
 skip/freebsd
 skip/rhel8.0
+skip/rhel8.0b
 skip/docker
 needs/root
 destructive
diff --git a/test/runner/completion/remote.txt b/test/runner/completion/remote.txt
index 6263cf70ca5..70894a1bfd7 100644
--- a/test/runner/completion/remote.txt
+++ b/test/runner/completion/remote.txt
@@ -2,4 +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.0b python=3.6