From 4f939d4b2bdc118bb205699e88423346284c2301 Mon Sep 17 00:00:00 2001
From: Sam Doran <sdoran@redhat.com>
Date: Tue, 9 Jul 2019 17:45:06 -0400
Subject: [PATCH] [stable-2.8] Move integration tests to using RHEL 8.0 GA
 (#57772). (cherry picked from commit
 b9dafdbade2a95051f8bee1bbe2a1d7dcb0c40b2)

Co-authored-by: Sam Doran <sdoran@redhat.com>
---
 shippable.yml                                | 8 ++++----
 test/integration/targets/dnf/vars/RedHat.yml | 2 +-
 test/runner/completion/remote.txt            | 2 +-
 test/runner/setup/remote.sh                  | 3 ---
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/shippable.yml b/shippable.yml
index 4b2c78213ec..4f6e573671d 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.0b/1
+    - env: T=rhel/8.0/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.0b/2
+    - env: T=rhel/8.0/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.0b/3
+    - env: T=rhel/8.0/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.0b/4
+    - env: T=rhel/8.0/4
     - env: T=freebsd/11.1/4
     - env: T=freebsd/12.0/4
     - env: T=linux/centos6/4
diff --git a/test/integration/targets/dnf/vars/RedHat.yml b/test/integration/targets/dnf/vars/RedHat.yml
index 3285e76151b..0fd8ee4b01d 100644
--- a/test/integration/targets/dnf/vars/RedHat.yml
+++ b/test/integration/targets/dnf/vars/RedHat.yml
@@ -1 +1 @@
-astream_name: '@php:7.1/minimal'
+astream_name: '@php:7.2/minimal'
diff --git a/test/runner/completion/remote.txt b/test/runner/completion/remote.txt
index 70894a1bfd7..6263cf70ca5 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.0b python=3.6
+rhel/8.0 python=3.6
diff --git a/test/runner/setup/remote.sh b/test/runner/setup/remote.sh
index b4ba94f262b..79552594582 100644
--- a/test/runner/setup/remote.sh
+++ b/test/runner/setup/remote.sh
@@ -44,9 +44,6 @@ if [ "${platform}" = "freebsd" ]; then
 elif [ "${platform}" = "rhel" ]; then
     if grep '8\.' /etc/redhat-release; then
         while true; do
-            curl --silent --show-error -o /etc/yum.repos.d/rhel-8-beta.repo http://downloads.redhat.com/redhat/rhel/rhel-8-beta/rhel-8-beta.repo && \
-            dnf config-manager --set-enabled rhel-8-for-x86_64-baseos-beta-rpms && \
-            dnf config-manager --set-enabled rhel-8-for-x86_64-appstream-beta-rpms && \
             yum module install -q -y python36 && \
             yum install -q -y \
                 gcc \