Skip to content

Commit 54914bc

Browse files
committed
(PA-5998) Add sles11-x86_64 to puppet-runtime
1 parent 531fb1f commit 54914bc

File tree

2 files changed

+19
-14
lines changed

2 files changed

+19
-14
lines changed

configs/components/runtime-agent.rb

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,15 @@
33
pkg.environment "PROJECT_SHORTNAME", "puppet"
44
pkg.add_source "file://resources/files/runtime/runtime.sh"
55

6-
if platform.name =~ /sles-11-x86_64/ && settings[:ruby_version] =~ /2.7/
7-
pkg.install do
8-
"zypper install -y --oldpackage pl-gcc=4.8.2-1"
6+
if platform.name =~ /sles-11-x86_64/
7+
if settings[:ruby_version] =~ /2.7/
8+
pkg.install do
9+
"zypper install -y pl-gcc=4.8.2-1"
10+
end
11+
else
12+
pkg.install do
13+
"zypper install -y pl-gcc8"
14+
end
915
end
1016
end
1117

configs/platforms/sles-11-x86_64.rb

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,16 @@
44
plat.servicetype "sysv"
55
plat.add_build_repository "http://osmirror.delivery.puppetlabs.net/sles-11-deps-x86_64/sles-11-deps-x86_64.repo"
66
plat.add_build_repository "http://pl-build-tools.delivery.puppetlabs.net/yum/sles/11/x86_64/pl-build-tools-sles-11-x86_64.repo"
7-
packages = [
8-
"aaa_base",
9-
"libbz2-devel",
10-
"make",
11-
"pkgconfig",
12-
"pl-autotools",
13-
"pl-cmake",
14-
"pl-gcc",
15-
"readline-devel",
16-
"rsync",
17-
"zlib-devel"
7+
packages = %w[
8+
aaa_base
9+
libbz2-devel
10+
make
11+
pkgconfig
12+
pl-autotools
13+
pl-cmake
14+
readline-devel
15+
rsync
16+
zlib-devel
1817
]
1918
plat.provision_with("zypper -n --no-gpg-checks install -y #{packages.join(' ')}")
2019
plat.provision_with "zypper install -y --oldpackage pl-cmake=3.2.3-13.sles11"

0 commit comments

Comments
 (0)