From dc1b0fb89bce7329ae2a956520c10bf9fe9e69f3 Mon Sep 17 00:00:00 2001 From: Lukas Audzevicius Date: Wed, 18 Feb 2026 11:16:31 +0000 Subject: [PATCH 1/4] (CAT-2539) Test SLES docker containers --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c236bbc2..963ab9b1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,5 +15,5 @@ jobs: needs: Spec uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main" with: - flags: "--nightly --arch-exclude arm" + flags: "--nightly --arch-exclude arm --platform-include sles-15" secrets: "inherit" From 37b8df7fd542342d4c927b6f52472687f3baa3e5 Mon Sep 17 00:00:00 2001 From: Lukas Audzevicius Date: Wed, 18 Feb 2026 11:19:48 +0000 Subject: [PATCH 2/4] Remove temporary fix for testing --- manifests/init.pp | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index ce5dcb9a..7e40c6f5 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -110,19 +110,6 @@ default => '--jre' } - # TEMPORARY FIX: If no repos are configured on SLES, add openSUSE Leap as fallback - # This workaround is needed because GCP-provisioned SLES images are unregistered BYOS - # without any package repositories configured. Remove this once proper PAYG images are used. - if ($facts['os']['family'] in ['SLES', 'SUSE']) { - exec { 'Configure zypper repo for SLES': - path => '/bin:/usr/bin:/sbin:/usr/sbin', - command => 'zypper --non-interactive --gpg-auto-import-keys ar http://download.opensuse.org/distribution/leap/15.6/repo/oss/ opensuse-leap-fallback && zypper --non-interactive --gpg-auto-import-keys refresh', - unless => "zypper lr 2>/dev/null | grep -q 'opensuse-leap-fallback\\|http'", - logoutput => true, - } - -> Package['java'] - } - if $facts['os']['family'] == 'Debian' { # Needed for update-java-alternatives package { 'java-common': From c5d469b0456485b56148be856e5cc5878b66cbe3 Mon Sep 17 00:00:00 2001 From: Lukas Audzevicius Date: Wed, 18 Feb 2026 11:43:51 +0000 Subject: [PATCH 3/4] test against docker --- Gemfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 4e7de031..820ef5a0 100644 --- a/Gemfile +++ b/Gemfile @@ -64,8 +64,7 @@ group :development, :release_prep do gem "puppet-blacksmith", '~> 7.0', require: false end group :system_tests do - gem "puppet_litmus", '~> 2.0', require: false, platforms: [:ruby, :x64_mingw] if !ENV['PUPPET_FORGE_TOKEN'].to_s.empty? - gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw] if ENV['PUPPET_FORGE_TOKEN'].to_s.empty? + gem "puppet_litmus", require: false, platforms: [:ruby, :x64_mingw], git: 'https://github.com/puppetlabs/puppet_litmus', branch: 'CAT-2476-Address_SLES_failures' gem "CFPropertyList", '< 3.0.7', require: false, platforms: [:mswin, :mingw, :x64_mingw] gem "serverspec", '~> 2.41', require: false end From 1e5dc1c9a89a06eed268645eff7b0c676ab53592 Mon Sep 17 00:00:00 2001 From: Lukas Audzevicius Date: Thu, 19 Feb 2026 10:16:48 +0000 Subject: [PATCH 4/4] bring back temporary fix to test against redundancy --- manifests/init.pp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/manifests/init.pp b/manifests/init.pp index 7e40c6f5..ce5dcb9a 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -110,6 +110,19 @@ default => '--jre' } + # TEMPORARY FIX: If no repos are configured on SLES, add openSUSE Leap as fallback + # This workaround is needed because GCP-provisioned SLES images are unregistered BYOS + # without any package repositories configured. Remove this once proper PAYG images are used. + if ($facts['os']['family'] in ['SLES', 'SUSE']) { + exec { 'Configure zypper repo for SLES': + path => '/bin:/usr/bin:/sbin:/usr/sbin', + command => 'zypper --non-interactive --gpg-auto-import-keys ar http://download.opensuse.org/distribution/leap/15.6/repo/oss/ opensuse-leap-fallback && zypper --non-interactive --gpg-auto-import-keys refresh', + unless => "zypper lr 2>/dev/null | grep -q 'opensuse-leap-fallback\\|http'", + logoutput => true, + } + -> Package['java'] + } + if $facts['os']['family'] == 'Debian' { # Needed for update-java-alternatives package { 'java-common':