From 5cd02deacf8b8d2881790787b13d7da174967c53 Mon Sep 17 00:00:00 2001 From: Martin Krizek Date: Mon, 10 Jul 2023 17:26:24 +0200 Subject: [PATCH] Re-introduce RHEL 9 modularity testing in CI (#81160) (#81193) (cherry picked from commit 7b2647f3b2670194a6a39d4c36678d1847354b6f) --- test/integration/targets/dnf/tasks/main.yml | 1 - test/integration/targets/dnf/vars/RedHat-9.yml | 5 ++--- 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 66a171ac94f..65b77cebe2f 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', '>=')) tags: diff --git a/test/integration/targets/dnf/vars/RedHat-9.yml b/test/integration/targets/dnf/vars/RedHat-9.yml index 5681e7019d4..680157dcd62 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'