Skip to content

Commit

Permalink
Merge pull request puppetlabs-toy-chest#802 from amitkarsale/PA-5998-…
Browse files Browse the repository at this point in the history
…sles

(PA-5998) Add sles11-x86_64 to puppet-runtime
  • Loading branch information
joshcooper authored Mar 13, 2024
2 parents 531fb1f + 54914bc commit 78d1786
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 14 deletions.
12 changes: 9 additions & 3 deletions configs/components/runtime-agent.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,15 @@
pkg.environment "PROJECT_SHORTNAME", "puppet"
pkg.add_source "file://resources/files/runtime/runtime.sh"

if platform.name =~ /sles-11-x86_64/ && settings[:ruby_version] =~ /2.7/
pkg.install do
"zypper install -y --oldpackage pl-gcc=4.8.2-1"
if platform.name =~ /sles-11-x86_64/
if settings[:ruby_version] =~ /2.7/
pkg.install do
"zypper install -y pl-gcc=4.8.2-1"
end
else
pkg.install do
"zypper install -y pl-gcc8"
end
end
end

Expand Down
21 changes: 10 additions & 11 deletions configs/platforms/sles-11-x86_64.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,16 @@
plat.servicetype "sysv"
plat.add_build_repository "http://osmirror.delivery.puppetlabs.net/sles-11-deps-x86_64/sles-11-deps-x86_64.repo"
plat.add_build_repository "http://pl-build-tools.delivery.puppetlabs.net/yum/sles/11/x86_64/pl-build-tools-sles-11-x86_64.repo"
packages = [
"aaa_base",
"libbz2-devel",
"make",
"pkgconfig",
"pl-autotools",
"pl-cmake",
"pl-gcc",
"readline-devel",
"rsync",
"zlib-devel"
packages = %w[
aaa_base
libbz2-devel
make
pkgconfig
pl-autotools
pl-cmake
readline-devel
rsync
zlib-devel
]
plat.provision_with("zypper -n --no-gpg-checks install -y #{packages.join(' ')}")
plat.provision_with "zypper install -y --oldpackage pl-cmake=3.2.3-13.sles11"
Expand Down

0 comments on commit 78d1786

Please sign in to comment.