diff options
| author | Rick Elrod <rick@elrod.me> | 2020-04-29 17:00:35 -0500 |
|---|---|---|
| committer | Matt Clay <matt@mystile.com> | 2020-04-30 14:32:40 -0700 |
| commit | 4a20196492bae8a71d5ae3fa76bc91ae58588cba (patch) | |
| tree | b8e851ac5ba896f6165180bf0d6cfa18e746090d | |
| parent | 07084217dc4d5ee1f5434eb8bfde7f16e968200f (diff) | |
| download | ansible-4a20196492bae8a71d5ae3fa76bc91ae58588cba.tar.gz | |
Enable dnf integration tests on CentOS 8
Change:
We were only testing dnf on RHEL previously.
Test on CentOS 8 as well.
Test Plan:
Ran locally in docker.
Signed-off-by: Rick Elrod <rick@elrod.me>
| -rw-r--r-- | test/integration/targets/dnf/tasks/dnfinstallroot.yml | 3 | ||||
| -rw-r--r-- | test/integration/targets/dnf/tasks/main.yml | 8 | ||||
| -rw-r--r-- | test/integration/targets/dnf/vars/CentOS.yml | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/test/integration/targets/dnf/tasks/dnfinstallroot.yml b/test/integration/targets/dnf/tasks/dnfinstallroot.yml index 25ec80a727..b5e0901166 100644 --- a/test/integration/targets/dnf/tasks/dnfinstallroot.yml +++ b/test/integration/targets/dnf/tasks/dnfinstallroot.yml @@ -11,7 +11,8 @@ - name: Populate directory copy: - content: "{{ ansible_distribution_version }}\n" + # 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. diff --git a/test/integration/targets/dnf/tasks/main.yml b/test/integration/targets/dnf/tasks/main.yml index 1135509f94..9369b5b0cd 100644 --- a/test/integration/targets/dnf/tasks/main.yml +++ b/test/integration/targets/dnf/tasks/main.yml @@ -21,15 +21,15 @@ - include_tasks: dnf.yml when: (ansible_distribution == 'Fedora' and ansible_distribution_major_version is version('23', '>=')) or - (ansible_distribution == 'RedHat' and ansible_distribution_major_version is version('8', '>=')) + (ansible_distribution in ['RedHat', 'CentOS'] and ansible_distribution_major_version is version('8', '>=')) - include_tasks: repo.yml when: (ansible_distribution == 'Fedora' and ansible_distribution_major_version is version('23', '>=')) or - (ansible_distribution == 'RedHat' and ansible_distribution_major_version is version('8', '>=')) + (ansible_distribution in ['RedHat', 'CentOS'] and ansible_distribution_major_version is version('8', '>=')) - include_tasks: dnfinstallroot.yml when: (ansible_distribution == 'Fedora' and ansible_distribution_major_version is version('23', '>=')) or - (ansible_distribution == 'RedHat' and ansible_distribution_major_version is version('8', '>=')) + (ansible_distribution in ['RedHat', 'CentOS'] and ansible_distribution_major_version is version('8', '>=')) # Attempting to install a different RHEL release in a tmpdir doesn't work (rhel8 beta) - include_tasks: dnfreleasever.yml @@ -39,4 +39,4 @@ - include_tasks: modularity.yml when: (ansible_distribution == 'Fedora' and ansible_distribution_major_version is version('29', '>=')) or - (ansible_distribution == 'RedHat' and ansible_distribution_major_version is version('8', '>=')) + (ansible_distribution in ['RedHat', 'CentOS'] and ansible_distribution_major_version is version('8', '>=')) diff --git a/test/integration/targets/dnf/vars/CentOS.yml b/test/integration/targets/dnf/vars/CentOS.yml new file mode 100644 index 0000000000..c70d8538d8 --- /dev/null +++ b/test/integration/targets/dnf/vars/CentOS.yml @@ -0,0 +1,2 @@ +astream_name: '@php:7.2/minimal' +astream_name_no_stream: '@php/minimal' |