Skip to content

Commit d406d20

Browse files
committed
adjust suse connect, remove docker provisioning
1 parent 6b47744 commit d406d20

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

Gemfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ group :development, :release_prep do
6464
gem "puppet-blacksmith", '~> 7.0', require: false
6565
end
6666
group :system_tests do
67-
gem "puppet_litmus", git: 'https://github.com/puppetlabs/puppet_litmus', branch: 'CAT-2476-Address_SLES_failures', require: false, platforms: [:ruby, :x64_mingw]
67+
gem "puppet_litmus", '~> 2.4', require: false, platforms: [:ruby, :x64_mingw] if !ENV['PUPPET_FORGE_TOKEN'].to_s.empty?
68+
gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw] if ENV['PUPPET_FORGE_TOKEN'].to_s.empty?
6869
gem "CFPropertyList", '< 3.0.7', require: false, platforms: [:mswin, :mingw, :x64_mingw]
6970
gem "serverspec", '~> 2.41', require: false
7071
end

manifests/init.pp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,12 @@
111111
}
112112

113113
# If the OS is SLES >= 15.3, enable the legacy repo to install net-tools-deprecated package
114+
# Only attempt this if the system is registered with SUSE
114115
if ($facts['os']['family'] in ['SLES', 'SUSE']) and (versioncmp($facts['os']['release']['full'], '15.3') >= 0) {
115116
exec { 'Enable legacy repos':
116117
path => '/bin:/usr/bin/:/sbin:/usr/sbin',
117-
command => "SUSEConnect --product sle-module-legacy/${facts['os']['release']['full']}/x86_64",
118-
unless => "SUSEConnect --status-text | grep sle-module-legacy/${facts['os']['release']['full']}/x86_64",
118+
command => "SUSEConnect --product sle-module-legacy/${facts['os']['release']['major']}/x86_64",
119+
unless => "test ! -f /usr/bin/SUSEConnect || SUSEConnect --status-text | grep -q 'Not Registered' || SUSEConnect --status-text | grep sle-module-legacy/${facts['os']['release']['major']}/x86_64",
119120
}
120121
}
121122

0 commit comments

Comments
 (0)