From af8c9b8d9ee8aa0baeb6130ba8b56d463b30d1a7 Mon Sep 17 00:00:00 2001
From: Sam Doran <sdoran@redhat.com>
Date: Thu, 23 Jul 2020 14:10:21 -0400
Subject: [PATCH 1/2] Add RHEL 7.9 beta to test matrix

---
 shippable.yml                                 | 139 +-----------------
 .../ansible_test/_data/completion/remote.txt  |   1 +
 2 files changed, 7 insertions(+), 133 deletions(-)

diff --git a/shippable.yml b/shippable.yml
index 5090901566145f..40b3c7e57ca9d6 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -8,139 +8,12 @@ matrix:
   exclude:
     - env: T=none
   include:
-    - env: T=sanity/1
-    - env: T=sanity/2
-    - env: T=sanity/3
-    - env: T=sanity/4
-    - env: T=sanity/5
-
-    - env: T=units/2.6
-    - env: T=units/2.7
-    - env: T=units/3.5
-    - env: T=units/3.6
-    - env: T=units/3.7
-    - env: T=units/3.8
-    - env: T=units/3.9
-
-    - env: T=windows/2012/1
-    - env: T=windows/2012-R2/1
-    - env: T=windows/2016/1
-    - env: T=windows/2019/1
-
-    - env: T=macos/10.15/1
-    - env: T=rhel/7.8/1
-    - env: T=rhel/8.2/1
-    - env: T=freebsd/11.1/1
-    - env: T=freebsd/12.1/1
-    - env: T=linux/alpine3/1
-    - env: T=linux/centos6/1
-    - env: T=linux/centos7/1
-    - env: T=linux/centos8/1
-    - env: T=linux/fedora31/1
-    - env: T=linux/fedora32/1
-    - env: T=linux/opensuse15py2/1
-    - env: T=linux/opensuse15/1
-    - env: T=linux/ubuntu1604/1
-    - env: T=linux/ubuntu1804/1
-
-    - env: T=macos/10.15/2
-    - env: T=rhel/7.8/2
-    - env: T=rhel/8.2/2
-    - env: T=freebsd/11.1/2
-    - env: T=freebsd/12.1/2
-    - env: T=linux/alpine3/2
-    - env: T=linux/centos6/2
-    - env: T=linux/centos7/2
-    - env: T=linux/centos8/2
-    - env: T=linux/fedora31/2
-    - env: T=linux/fedora32/2
-    - env: T=linux/opensuse15py2/2
-    - env: T=linux/opensuse15/2
-    - env: T=linux/ubuntu1604/2
-    - env: T=linux/ubuntu1804/2
-
-    - env: T=macos/10.15/3
-    - env: T=rhel/7.8/3
-    - env: T=rhel/8.2/3
-    - env: T=freebsd/11.1/3
-    - env: T=freebsd/12.1/3
-    - env: T=linux/alpine3/3
-    - env: T=linux/centos6/3
-    - env: T=linux/centos7/3
-    - env: T=linux/centos8/3
-    - env: T=linux/fedora31/3
-    - env: T=linux/fedora32/3
-    - env: T=linux/opensuse15py2/3
-    - env: T=linux/opensuse15/3
-    - env: T=linux/ubuntu1604/3
-    - env: T=linux/ubuntu1804/3
-
-    - env: T=macos/10.15/4
-    - env: T=rhel/7.8/4
-    - env: T=rhel/8.2/4
-    - env: T=freebsd/11.1/4
-    - env: T=freebsd/12.1/4
-    - env: T=linux/alpine3/4
-    - env: T=linux/centos6/4
-    - env: T=linux/centos7/4
-    - env: T=linux/centos8/4
-    - env: T=linux/fedora31/4
-    - env: T=linux/fedora32/4
-    - env: T=linux/opensuse15py2/4
-    - env: T=linux/opensuse15/4
-    - env: T=linux/ubuntu1604/4
-    - env: T=linux/ubuntu1804/4
-
-    - env: T=macos/10.15/5
-    - env: T=rhel/7.8/5
-    - env: T=rhel/8.2/5
-    - env: T=freebsd/11.1/5
-    - env: T=freebsd/12.1/5
-    - env: T=linux/alpine3/5
-    - env: T=linux/centos6/5
-    - env: T=linux/centos7/5
-    - env: T=linux/centos8/5
-    - env: T=linux/fedora31/5
-    - env: T=linux/fedora32/5
-    - env: T=linux/opensuse15py2/5
-    - env: T=linux/opensuse15/5
-    - env: T=linux/ubuntu1604/5
-    - env: T=linux/ubuntu1804/5
-
-    - env: T=galaxy/2.7/1
-    - env: T=galaxy/3.6/1
-
-    - env: T=generic/2.7/1
-    - env: T=generic/3.6/1
-
-    - env: T=i/osx/10.11
-    - env: T=i/rhel/7.8
-    - env: T=i/rhel/8.2
-    - env: T=i/freebsd/11.1
-    - env: T=i/freebsd/12.1
-    - env: T=i/linux/centos6
-    - env: T=i/linux/centos7
-    - env: T=i/linux/centos8
-    - env: T=i/linux/fedora31
-    - env: T=i/linux/fedora32
-    - env: T=i/linux/opensuse15py2
-    - env: T=i/linux/opensuse15
-    - env: T=i/linux/ubuntu1604
-    - env: T=i/linux/ubuntu1804
-
-    - env: T=i/windows/2012
-    - env: T=i/windows/2012-R2
-    - env: T=i/windows/2016
-    - env: T=i/windows/2019
-
-    - env: T=i/ios/csr1000v//1
-    - env: T=i/vyos/1.1.8/2.7/1
-    - env: T=i/vyos/1.1.8/3.6/1
-
-    - env: T=i/aws/2.7/1
-    - env: T=i/aws/3.6/1
-    - env: T=i/tower//1
-    - env: T=i/cloud//1
+    - env: T=rhel/7.9b/1
+    - env: T=rhel/7.9b/2
+    - env: T=rhel/7.9b/3
+    - env: T=rhel/7.9b/4
+    - env: T=rhel/7.9b/5
+    - env: T=i/rhel/7.9b
 
 branches:
   except:
diff --git a/test/lib/ansible_test/_data/completion/remote.txt b/test/lib/ansible_test/_data/completion/remote.txt
index 0ad20538c93ca5..93de94d72dd726 100644
--- a/test/lib/ansible_test/_data/completion/remote.txt
+++ b/test/lib/ansible_test/_data/completion/remote.txt
@@ -4,6 +4,7 @@ osx/10.11 python=2.7 python_dir=/usr/local/bin
 macos/10.15 python=3.8 python_dir=/usr/local/bin
 rhel/7.6 python=2.7
 rhel/7.8 python=2.7
+rhel/7.9b python=2.7
 rhel/8.1 python=3.6
 rhel/8.2 python=3.6
 aix/7.2 python=2.7 httptester=disabled temp-unicode=disabled pip-check=disabled

From 95c6cfaaf317be5997a20293f1b99a4d3ef698b9 Mon Sep 17 00:00:00 2001
From: Sam Doran <sdoran@redhat.com>
Date: Thu, 23 Jul 2020 16:47:10 -0400
Subject: [PATCH 2/2] Just keep going

---
 test/utils/shippable/remote.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/utils/shippable/remote.sh b/test/utils/shippable/remote.sh
index cd3014ccac732c..5380bbec35078f 100755
--- a/test/utils/shippable/remote.sh
+++ b/test/utils/shippable/remote.sh
@@ -18,5 +18,5 @@ stage="${S:-prod}"
 provider="${P:-default}"
 
 # shellcheck disable=SC2086
-ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} \
+ansible-test integration --color -v --continue-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} \
     --remote "${platform}/${version}" --remote-terminate always --remote-stage "${stage}" --remote-provider "${provider}"