diff options
| author | Matt Clay <mclay@redhat.com> | 2020-04-08 21:09:52 -0700 |
|---|---|---|
| committer | Matt Clay <matt@mystile.com> | 2020-04-09 01:53:42 -0700 |
| commit | c59d722d989d6135693cf87a275a4e5197ecf736 (patch) | |
| tree | 2171789fd9f7c01769e4b847e4fe9777c77b4ec1 | |
| parent | 3d8d43bd4ce9c2c40e1a2ac3c68f2f2d2fec9a20 (diff) | |
| download | ansible-c59d722d989d6135693cf87a275a4e5197ecf736.tar.gz | |
[stable-2.7] Update tests to use RHEL 7.8. (#68787)
* Update tests to use RHEL 7.8.
Keeping support for RHEL 7.6 since collections are still using it.
* Fix tests for RHEL 7.7+ due to extras repo name change..
(cherry picked from commit 04edd77c4273b321867c0f08d6ff2b67dacfcf2d)
Co-authored-by: Matt Clay <mclay@redhat.com>
| -rw-r--r-- | changelogs/fragments/ansible-test-rhel-7.8.yml | 2 | ||||
| -rw-r--r-- | shippable.yml | 6 | ||||
| -rw-r--r-- | test/integration/targets/setup_docker/tasks/RedHat-7.yml | 3 | ||||
| -rw-r--r-- | test/runner/completion/remote.txt | 1 |
4 files changed, 8 insertions, 4 deletions
diff --git a/changelogs/fragments/ansible-test-rhel-7.8.yml b/changelogs/fragments/ansible-test-rhel-7.8.yml new file mode 100644 index 0000000000..39ef06ef5e --- /dev/null +++ b/changelogs/fragments/ansible-test-rhel-7.8.yml @@ -0,0 +1,2 @@ +minor_changes: + - ansible-test now supports testing against RHEL 7.8 when using the ``--remote`` option. diff --git a/shippable.yml b/shippable.yml index 1b61950279..416646a68b 100644 --- a/shippable.yml +++ b/shippable.yml @@ -42,7 +42,7 @@ matrix: - env: T=network - env: T=osx/10.11/1 - - env: T=rhel/7.6/1 + - env: T=rhel/7.8/1 - env: T=freebsd/11.1/1 - env: T=linux/centos6/1 - env: T=linux/centos7/1 @@ -54,7 +54,7 @@ matrix: - env: T=linux/ubuntu1804/1 - env: T=osx/10.11/2 - - env: T=rhel/7.6/2 + - env: T=rhel/7.8/2 - env: T=freebsd/11.1/2 - env: T=linux/centos6/2 - env: T=linux/centos7/2 @@ -66,7 +66,7 @@ matrix: - env: T=linux/ubuntu1804/2 - env: T=osx/10.11/3 - - env: T=rhel/7.6/3 + - env: T=rhel/7.8/3 - env: T=freebsd/11.1/3 - env: T=linux/centos6/3 - env: T=linux/centos7/3 diff --git a/test/integration/targets/setup_docker/tasks/RedHat-7.yml b/test/integration/targets/setup_docker/tasks/RedHat-7.yml index 7a32d85612..4124565a54 100644 --- a/test/integration/targets/setup_docker/tasks/RedHat-7.yml +++ b/test/integration/targets/setup_docker/tasks/RedHat-7.yml @@ -11,7 +11,8 @@ name: https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm - name: Enable extras repository for RHEL on AWS - command: yum-config-manager --enable rhui-REGION-rhel-server-extras + # RHEL 7.6 uses rhui-REGION-rhel-server-extras and RHEL 7.7+ use rhui-rhel-7-server-rhui-extras-rpms + command: yum-config-manager --enable rhui-REGION-rhel-server-extras rhui-rhel-7-server-rhui-extras-rpms args: warn: no diff --git a/test/runner/completion/remote.txt b/test/runner/completion/remote.txt index 955271c99b..0d4f89dd60 100644 --- a/test/runner/completion/remote.txt +++ b/test/runner/completion/remote.txt @@ -1,3 +1,4 @@ freebsd/11.1 osx/10.11 rhel/7.6 +rhel/7.8 |