From e2b303301fe6ab2cc454e5f43b423c9c79430dfa Mon Sep 17 00:00:00 2001 From: Odilon Sousa Date: Mon, 3 Aug 2026 10:02:08 -0300 Subject: [PATCH] Assert valkey service on EL10 in redis acceptance test RHEL/CentOS Stream 10 dropped Redis in favor of Valkey; puppet-redis already handles this correctly by installing Package[valkey]/ Service[valkey] there instead of Package[redis]/Service[redis]. The acceptance test hardcoded 'redis' as the service name, which fails on EL10 even though the underlying install works. Ref: theforeman/el10_rebuild#25 --- spec/acceptance/basic_spec.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/spec/acceptance/basic_spec.rb b/spec/acceptance/basic_spec.rb index c50a275c..aa59efc6 100644 --- a/spec/acceptance/basic_spec.rb +++ b/spec/acceptance/basic_spec.rb @@ -33,7 +33,12 @@ class { 'pulpcore': it { is_expected.to be_listening } end - describe service('redis') do + # RHEL/CentOS Stream 10 dropped Redis in favor of Valkey (a + # Redis-protocol-compatible fork); puppet-redis installs Package[valkey]/ + # Service[valkey] there instead of Package[redis]/Service[redis]. + redis_service_name = (fact('os.family') == 'RedHat' && fact('os.release.major').to_i >= 10) ? 'valkey' : 'redis' + + describe service(redis_service_name) do it { is_expected.to be_running } it { is_expected.to be_enabled } end