summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Clay <matt@mystile.com>2019-11-06 07:59:51 -0800
committerMatt Clay <matt@mystile.com>2019-11-07 14:58:58 -0800
commit34c76bf2a139dfe182c182fee41e016c0e07d97d (patch)
tree2190c69b24e2e2c5f577d6238edebf30ff78c0fc
parent4afd3ad03b06a090ee7d99bd4ba692cda005b7d1 (diff)
downloadansible-34c76bf2a139dfe182c182fee41e016c0e07d97d.tar.gz
[stable-2.8] Switch from RHEL 8.0 & 8.1b to 8.1 in CI.
(cherry picked from commit 75646037dc3b927a33912fd968a1864920115c6e) Co-authored-by: Matt Clay <matt@mystile.com>
-rw-r--r--changelogs/fragments/ansible-test-rhel-8.1-testing.yml2
-rw-r--r--shippable.yml12
-rw-r--r--test/runner/completion/remote.txt3
3 files changed, 7 insertions, 10 deletions
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 0000000000..6eadfc2093
--- /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 da50313240..4bce5e0db8 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -80,8 +80,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
@@ -95,8 +94,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
@@ -110,8 +108,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
@@ -125,8 +122,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/runner/completion/remote.txt b/test/runner/completion/remote.txt
index 0ad0ac70e8..1d553d409f 100644
--- a/test/runner/completion/remote.txt
+++ b/test/runner/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