summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Krizek <martin.krizek@gmail.com>2023-07-10 09:54:36 +0200
committerGitHub <noreply@github.com>2023-07-10 09:54:36 +0200
commit7b2647f3b2670194a6a39d4c36678d1847354b6f (patch)
tree62363d263800166f350c71648538d1a9c6651c1e
parentansible-test - Remove old pytest-forked constraint (#81185) (diff)
downloadansible-7b2647f3b2670194a6a39d4c36678d1847354b6f.tar.xz
ansible-7b2647f3b2670194a6a39d4c36678d1847354b6f.zip
Re-introduce RHEL 9 modularity testing in CI (#81160)
-rw-r--r--test/integration/targets/dnf/tasks/main.yml1
-rw-r--r--test/integration/targets/dnf/vars/RedHat-9.yml5
2 files changed, 2 insertions, 4 deletions
diff --git a/test/integration/targets/dnf/tasks/main.yml b/test/integration/targets/dnf/tasks/main.yml
index 059bf747c9..c10b049240 100644
--- a/test/integration/targets/dnf/tasks/main.yml
+++ b/test/integration/targets/dnf/tasks/main.yml
@@ -59,7 +59,6 @@
- include_tasks: modularity.yml
when:
- - astream_name is defined
- (ansible_distribution == 'Fedora' and ansible_distribution_major_version is version('29', '>=')) or
(ansible_distribution in ['RedHat', 'CentOS'] and ansible_distribution_major_version is version('8', '>='))
- not dnf5|default('false')
diff --git a/test/integration/targets/dnf/vars/RedHat-9.yml b/test/integration/targets/dnf/vars/RedHat-9.yml
index 5681e7019d..680157dcd6 100644
--- a/test/integration/targets/dnf/vars/RedHat-9.yml
+++ b/test/integration/targets/dnf/vars/RedHat-9.yml
@@ -1,3 +1,2 @@
-# RHEL9.0 contains no modules, to be re-introduced in 9.1
-# astream_name: '@container-tools:latest/common'
-# astream_name_no_stream: '@container-tools/common'
+astream_name: '@php:8.1/minimal'
+astream_name_no_stream: '@php/minimal'