Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ jobs:
needs: Spec
uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main"
with:
flags: "--nightly"
flags: "--platform-include sles-15 --platform-include sles-12"
secrets: "inherit"
16 changes: 10 additions & 6 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,17 @@
default => '--jre'
}

# If the OS is SLES >= 15.3, enable the legacy repo to install net-tools-deprecated package
if ($facts['os']['family'] in ['SLES', 'SUSE']) and (versioncmp($facts['os']['release']['full'], '15.3') >= 0) {
exec { 'Enable legacy repos':
path => '/bin:/usr/bin/:/sbin:/usr/sbin',
command => "SUSEConnect --product sle-module-legacy/${facts['os']['release']['full']}/x86_64",
unless => "SUSEConnect --status-text | grep sle-module-legacy/${facts['os']['release']['full']}/x86_64",
# 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' {
Expand Down
Loading