From 13bc35e13c7a4fc496b72b3232d8a7ae1edc706a Mon Sep 17 00:00:00 2001
From: Brian Coca <bcoca@users.noreply.github.com>
Date: Mon, 16 Nov 2020 15:43:05 -0500
Subject: [PATCH] actual min changes needed for rhel8 (#72477)

* actual min changes needed for rhel8

 - specifiy releaserver as dnf/vars is ignored
---
 changelogs/fragments/test_rhel83.yml               |  2 ++
 shippable.yml                                      | 12 ++++++------
 .../targets/dnf/tasks/dnfinstallroot.yml           | 14 +-------------
 test/lib/ansible_test/_data/completion/remote.txt  |  1 +
 4 files changed, 10 insertions(+), 19 deletions(-)
 create mode 100644 changelogs/fragments/test_rhel83.yml

diff --git a/changelogs/fragments/test_rhel83.yml b/changelogs/fragments/test_rhel83.yml
new file mode 100644
index 00000000000..2e706caa489
--- /dev/null
+++ b/changelogs/fragments/test_rhel83.yml
@@ -0,0 +1,2 @@
+minor_changes:
+  - ansible-test Now supports RHEL 8.3
diff --git a/shippable.yml b/shippable.yml
index 93c744aea65..171cca1bf4c 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -29,7 +29,7 @@ matrix:
 
     - env: T=macos/10.15/1
     - env: T=rhel/7.9/1
-    - env: T=rhel/8.2/1
+    - env: T=rhel/8.3/1
     - env: T=freebsd/11.1/1
     - env: T=freebsd/12.2/1
     - env: T=linux/alpine3/1
@@ -45,7 +45,7 @@ matrix:
 
     - env: T=macos/10.15/2
     - env: T=rhel/7.9/2
-    - env: T=rhel/8.2/2
+    - env: T=rhel/8.3/2
     - env: T=freebsd/11.1/2
     - env: T=freebsd/12.2/2
     - env: T=linux/alpine3/2
@@ -61,7 +61,7 @@ matrix:
 
     - env: T=macos/10.15/3
     - env: T=rhel/7.9/3
-    - env: T=rhel/8.2/3
+    - env: T=rhel/8.3/3
     - env: T=freebsd/11.1/3
     - env: T=freebsd/12.2/3
     - env: T=linux/alpine3/3
@@ -77,7 +77,7 @@ matrix:
 
     - env: T=macos/10.15/4
     - env: T=rhel/7.9/4
-    - env: T=rhel/8.2/4
+    - env: T=rhel/8.3/4
     - env: T=freebsd/11.1/4
     - env: T=freebsd/12.2/4
     - env: T=linux/alpine3/4
@@ -93,7 +93,7 @@ matrix:
 
     - env: T=macos/10.15/5
     - env: T=rhel/7.9/5
-    - env: T=rhel/8.2/5
+    - env: T=rhel/8.3/5
     - env: T=freebsd/11.1/5
     - env: T=freebsd/12.2/5
     - env: T=linux/alpine3/5
@@ -115,7 +115,7 @@ matrix:
 
     - env: T=i/osx/10.11
     - env: T=i/rhel/7.9
-    - env: T=i/rhel/8.2
+    - env: T=i/rhel/8.3
     - env: T=i/freebsd/11.1
     - env: T=i/freebsd/12.2
     - env: T=i/linux/centos6
diff --git a/test/integration/targets/dnf/tasks/dnfinstallroot.yml b/test/integration/targets/dnf/tasks/dnfinstallroot.yml
index b5e0901166e..19f67069096 100644
--- a/test/integration/targets/dnf/tasks/dnfinstallroot.yml
+++ b/test/integration/targets/dnf/tasks/dnfinstallroot.yml
@@ -3,21 +3,9 @@
   command: mktemp -d "{{ remote_tmp_dir }}/ansible.test.XXXXXX"
   register: dnfroot
 
-- name: Make a necessary directory
-  file:
-    path: "/{{ dnfroot.stdout }}/etc/dnf/vars/"
-    state: directory
-    mode: 0755
-
-- name: Populate directory
-  copy:
-    # We need '8' for CentOS, but '8.x' for RHEL.
-    content: "{{ ansible_distribution_version|int if ansible_distribution != 'RedHat' else ansible_distribution_version }}\n"
-    dest: "/{{ dnfroot.stdout }}/etc/dnf/vars/releasever"
-
 # This will drag in > 200 MB.
 - name: attempt installroot
-  dnf: name=sos installroot="/{{ dnfroot.stdout }}/" disable_gpg_check=yes
+  dnf: name=sos installroot="/{{ dnfroot.stdout }}/" disable_gpg_check=yes releasever={{ansible_facts['distribution_major_version']}}
   register: dnf_result
 
 - name: check sos with rpm in installroot
diff --git a/test/lib/ansible_test/_data/completion/remote.txt b/test/lib/ansible_test/_data/completion/remote.txt
index c63f75b44b2..7123fdacff3 100644
--- a/test/lib/ansible_test/_data/completion/remote.txt
+++ b/test/lib/ansible_test/_data/completion/remote.txt
@@ -8,5 +8,6 @@ rhel/7.8 python=2.7
 rhel/7.9 python=2.7
 rhel/8.1 python=3.6
 rhel/8.2 python=3.6
+rhel/8.3 python=3.6
 aix/7.2 python=2.7 httptester=disabled temp-unicode=disabled pip-check=disabled
 power/centos/7 python=2.7