Merge pull request #666 from nmburgan/issue/master/pe-36058_pe_runtimes_for_puppet_8

(PE-36058) Updates for pe-bolt-server-runtime and pe-installer-runtime for Puppet 8

Author: nmburgan

configs/components/_base-rubygem.rb

@@ -24,6 +24,7 @@
 # When cross-compiling, we can't use the rubygems we just built.
 # Instead we use the host gem installation and override GEM_HOME. Yay?
 pkg.environment "GEM_HOME", settings[:gem_home]
+pkg.environment "GEM_PATH", settings[:gem_home]
 
 # PA-25 in order to install gems in a cross-compiled environment we need to
 # set RUBYLIB to include puppet and hiera, so that their gemspecs can resolve

configs/components/rubygem-puppet.rb

@@ -5,6 +5,8 @@
   pkg.version version
 
   case version
+  when '8.0.1'
+    pkg.md5sum '7e87d988e485c0f0c3d6ef76bd39409d'
   when '7.24.0'
     pkg.md5sum '3e996d5ceb0af826c95484494ad8a9a4'
   when '6.28.0'

configs/components/rubygem-rubyntlm.rb

@@ -1,6 +1,23 @@
 component 'rubygem-rubyntlm' do |pkg, settings, platform|
-  pkg.version '0.6.3'
-  pkg.md5sum 'e1f7477acf8a7d3effb2a3fb931aa84c'
+  #pkg.version '0.6.3'
+  #pkg.md5sum 'e1f7477acf8a7d3effb2a3fb931aa84c'
+  
+  # This is only needed when building the gem ourselves, as the
+  # gemspec file calls out to git for one of its values.
+  pkg.build_requires 'git'
+  pkg.environment "GEM_HOME", settings[:gem_home]
+  pkg.environment "GEM_PATH", settings[:gem_home]
+  pkg.url("https://github.com/nmburgan/rubyntlm.git")
+  pkg.ref("openssl-3-legacy")
+  pkg.build do
+    ["#{settings[:gem_build]} rubyntlm.gemspec"]
+  end
 
-  instance_eval File.read('configs/components/_base-rubygem.rb')
+  pkg.install do
+    [
+    "#{settings[:gem_install]} rubyntlm-*.gem",
+    ]
+  end
+
+  #instance_eval File.read('configs/components/_base-rubygem.rb')
 end

configs/projects/_shared-pe-bolt-server.rb

@@ -36,6 +36,7 @@
 # Set desired versions for gem components that offer multiple versions:
 # TODO: Can runtime projects use these updated versions?
 proj.setting(:rubygem_deep_merge_version, '1.2.2')
+proj.setting(:rubygem_net_ssh_version, '7.0.1')
 
 # (pe-bolt-server does not run on Windows, so only the *nix path is here)
 proj.setting(:prefix, '/opt/puppetlabs/server/apps/bolt-server')

configs/projects/pe-bolt-server-runtime-main.rb

@@ -1,6 +1,6 @@
 project 'pe-bolt-server-runtime-main' do |proj|
   proj.setting(:pe_version, 'main')
-  proj.setting(:rubygem_puppet_version, '7.24.0')
+  proj.setting(:rubygem_puppet_version, '8.0.1')
   proj.setting(:rubygem_net_ssh_version, '7.0.1')
   # We build bolt server with the ruby installed in the puppet-agent dep. For ruby 2.7 we need to use a --no-document flag
   # for gem installs instead of --no-ri --no-rdoc. This setting allows us to use this while we support both ruby 2.5 and 2.7
@@ -9,5 +9,5 @@
 
   instance_eval File.read(File.join(File.dirname(__FILE__), '_shared-pe-bolt-server.rb'))
   proj.component 'rubygem-prime'
-  proj.component('rubygem-rexml')
+  proj.component 'rubygem-rexml'
 end

configs/projects/pe-installer-runtime-main.rb

@@ -1,16 +1,12 @@
 project 'pe-installer-runtime-main' do |proj|
   # Used in component configurations to conditionally include dependencies
   proj.setting(:runtime_project, 'pe-installer')
-  proj.setting(:ruby_version, '2.7.8')
-  proj.setting(:augeas_version, '1.11.0')
+  proj.setting(:ruby_version, '3.2.2')
+  proj.setting(:augeas_version, '1.13.0')
   # We need to explicitly define 1.1.1k here to avoid
   # build dep conflicts between openssl-1.1.1 needed by curl
   # and krb5-devel
-  if platform.name =~ /^redhatfips-8/
-    proj.setting(:openssl_version, '1.1.1k')
-  else 
-    proj.setting(:openssl_version, '1.1.1')
-  end
+  proj.setting(:openssl_version, '3.0')
   platform = proj.get_platform
 
   proj.version_from_git
@@ -64,7 +60,7 @@
   #
 
   # rubygem-net-ssh included in shared-agent-components
-  proj.setting(:rubygem_net_ssh_version, '5.2.0')
+  proj.setting(:rubygem_net_ssh_version, '7.0.1')
 
   ########
   # Load shared agent components