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"
secrets: "inherit"
18 changes: 15 additions & 3 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,23 @@
}

# If the OS is SLES >= 15.3, enable the legacy repo to install net-tools-deprecated package
# Only attempt this if SUSEConnect is available and the system is registered
# Enable Legacy (already in your code)
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",
path => '/bin:/usr/bin:/sbin:/usr/sbin',
command => "SUSEConnect --product sle-module-legacy/${facts['os']['release']['major']}/x86_64",
unless => "test ! -x /usr/bin/SUSEConnect || SUSEConnect --status-text | grep -qE '(Not Registered|sle-module-legacy/${facts['os']['release']['major']}/x86_64)'",
logoutput => true,
}

# NEW: enable Development Tools (for many *-devel packages, including OpenJDK 8)
exec { 'Enable development tools':
path => '/bin:/usr/bin:/sbin:/usr/sbin',
command => "SUSEConnect --product sle-module-development-tools/${facts['os']['release']['major']}/x86_64",
unless => "test ! -x /usr/bin/SUSEConnect || SUSEConnect --status-text | grep -qE '(Not Registered|sle-module-development-tools/${facts['os']['release']['major']}/x86_64)'",
logoutput => true,
require => Exec['Enable legacy repos'],
}
}

Expand Down
Loading