From 54914bce3540645730f7917e2a01a89744de6220 Mon Sep 17 00:00:00 2001
From: Amit Karsale <amit.karsale@perforce.com>
Date: Tue, 12 Mar 2024 17:54:19 +0530
Subject: [PATCH] (PA-5998) Add sles11-x86_64 to puppet-runtime

---
 configs/components/runtime-agent.rb | 12 +++++++++---
 configs/platforms/sles-11-x86_64.rb | 21 ++++++++++-----------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/configs/components/runtime-agent.rb b/configs/components/runtime-agent.rb
index fdcf2186d..7f9e96214 100644
--- a/configs/components/runtime-agent.rb
+++ b/configs/components/runtime-agent.rb
@@ -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
 
diff --git a/configs/platforms/sles-11-x86_64.rb b/configs/platforms/sles-11-x86_64.rb
index 955643a4b..33de5bd09 100644
--- a/configs/platforms/sles-11-x86_64.rb
+++ b/configs/platforms/sles-11-x86_64.rb
@@ -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"