Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

actual min changes needed for rhel8 #72477

Merged
merged 2 commits into from
Nov 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/test_rhel83.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
minor_changes:
- ansible-test Now supports RHEL 8.3
12 changes: 6 additions & 6 deletions shippable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
14 changes: 1 addition & 13 deletions test/integration/targets/dnf/tasks/dnfinstallroot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions test/lib/ansible_test/_data/completion/remote.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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