diff options
| -rw-r--r-- | .azure-pipelines/azure-pipelines.yml | 16 | ||||
| -rw-r--r-- | changelogs/fragments/ansible-test-rhel85.yaml | 2 | ||||
| -rw-r--r-- | test/integration/targets/dnf/tasks/gpg.yml | 14 | ||||
| -rw-r--r-- | test/lib/ansible_test/_data/completion/remote.txt | 1 |
4 files changed, 23 insertions, 10 deletions
diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 817796b788..e528609af7 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -92,10 +92,10 @@ stages: test: macos/11.1 - name: RHEL 7.9 test: rhel/7.9 - - name: RHEL 8.4 py36 - test: rhel/8.4@3.6 - - name: RHEL 8.4 py38 - test: rhel/8.4@3.8 + - name: RHEL 8.5 py36 + test: rhel/8.5@3.6 + - name: RHEL 8.5 py38 + test: rhel/8.5@3.8 - name: RHEL 9.0b test: rhel/9.0b - name: FreeBSD 12.2 @@ -171,10 +171,10 @@ stages: test: macos/11.1 - name: RHEL 7.9 test: rhel/7.9 - - name: RHEL 8.4 py36 - test: rhel/8.4@3.6 - - name: RHEL 8.4 py38 - test: rhel/8.4@3.8 + - name: RHEL 8.5 py36 + test: rhel/8.5@3.6 + - name: RHEL 8.5 py38 + test: rhel/8.5@3.8 - name: RHEL 9.0b test: rhel/9.0b - name: FreeBSD 12.2 diff --git a/changelogs/fragments/ansible-test-rhel85.yaml b/changelogs/fragments/ansible-test-rhel85.yaml new file mode 100644 index 0000000000..ccc9d18f71 --- /dev/null +++ b/changelogs/fragments/ansible-test-rhel85.yaml @@ -0,0 +1,2 @@ +minor_changes: + - ansible-test - Add support for ``rhel/8.5`` remote instances. diff --git a/test/integration/targets/dnf/tasks/gpg.yml b/test/integration/targets/dnf/tasks/gpg.yml index ab789ff2a7..72bdee02ce 100644 --- a/test/integration/targets/dnf/tasks/gpg.yml +++ b/test/integration/targets/dnf/tasks/gpg.yml @@ -10,10 +10,11 @@ - '{{ pkg_name }}' state: absent - - name: Install rpm-sign + - name: Install rpm-sign and attr dnf: name: - rpm-sign + - attr state: present - name: Create directory to use as local repo @@ -31,6 +32,14 @@ - name: Unsign the RPM shell: rpmsign --delsign {{ remote_tmp_dir }}/unsigned/{{ pkg_name }}* + # In RHEL 8.5 dnf uses libdnf to do checksum verification, which caches the checksum on an xattr of the file + # itself, so we need to clear that cache + - name: Clear libdnf checksum cache + shell: setfattr -x user.Librepo.checksum.sha256 {{ remote_tmp_dir }}/unsigned/{{ pkg_name }}* + when: ansible_distribution in ['RedHat', 'CentOS'] and + ansible_distribution_version is version('8.5', '>=') and + ansible_distribution_version is version('9', '<') + - name: createrepo command: createrepo . args: @@ -60,10 +69,11 @@ - "'is not signed' in res.msg" always: - - name: Remove rpm-sign (and test package if it got installed) + - name: Remove rpm-sign and attr (and test package if it got installed) dnf: name: - rpm-sign + - attr - "{{ pkg_name }}" state: absent diff --git a/test/lib/ansible_test/_data/completion/remote.txt b/test/lib/ansible_test/_data/completion/remote.txt index aa1100fb4d..5439572cb0 100644 --- a/test/lib/ansible_test/_data/completion/remote.txt +++ b/test/lib/ansible_test/_data/completion/remote.txt @@ -5,6 +5,7 @@ macos/11.1 python=3.9 python_dir=/usr/local/bin provider=parallels macos python_dir=/usr/local/bin provider=parallels rhel/7.9 python=2.7 provider=aws rhel/8.4 python=3.6,3.8 provider=aws +rhel/8.5 python=3.6,3.8,3.9 provider=aws rhel/9.0b python=3.9 provider=aws rhel provider=aws aix/7.2 python=2.7,3.7 python_dir=/opt/freeware/bin provider=ibmps |