From 03154d63601c1cf4048a035f7a60af0141cb6280 Mon Sep 17 00:00:00 2001 From: Lukas Audzevicius Date: Wed, 17 Jun 2026 09:33:48 +0100 Subject: [PATCH] Drop RedHat-7 from acceptance matrix RHEL 7 reached EOL in June 2024. puppet/epel 6.0.0 (released 2026-01-15) dropped EL7 support, breaking the acceptance test setup which installs the module unpinned. Exclude redhat-7 from the platform matrix in ci.yml alongside the other EL7 platforms already excluded. Tighten the epel setup condition in spec_helper_acceptance_local.rb to explicitly list the releases that need it (RHEL 9) rather than using a != 8 exclusion. Co-Authored-By: Claude Sonnet 4.6 --- .github/workflows/ci.yml | 2 +- spec/spec_helper_acceptance_local.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b2ca29bc..1c5215aa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,5 +32,5 @@ jobs: contains(github.event.pull_request.labels.*.name, 'allowed-for-ci')) uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main" with: - flags: '--nightly --platform-exclude centos-7 --platform-exclude scientific-7 --platform-exclude oraclelinux-7' + flags: '--nightly --platform-exclude centos-7 --platform-exclude scientific-7 --platform-exclude oraclelinux-7 --platform-exclude redhat-7' secrets: "inherit" diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb index 028923f2..9767e84e 100644 --- a/spec/spec_helper_acceptance_local.rb +++ b/spec/spec_helper_acceptance_local.rb @@ -42,7 +42,7 @@ def retry_on_error_matching(max_retry_count = MAX_RETRY_COUNT, retry_wait_interv # Make sure selinux is disabled so the tests work. LitmusHelper.instance.run_shell('setenforce 0', expect_failures: true) if os[:family].match?(%r{redhat|oracle}) - if os[:family] == 'redhat' && os[:release].to_i != 8 + if os[:family] == 'redhat' && [9].include?(os[:release].to_i) epel_owner = 'puppet' LitmusHelper.instance.run_shell("puppet module install #{epel_owner}/epel") LitmusHelper.instance.run_shell("puppet apply -e 'include epel'")