Skip to content

Commit f65cb9c

Browse files
authored
Merge pull request #911 from jonathannewman/PE-39261/master/add-2023.8.x
(PE-39261) add configurations for 2023.8.x
2 parents 24cb3c7 + 739815f commit f65cb9c

File tree

4 files changed

+48
-1
lines changed

4 files changed

+48
-1
lines changed

.github/workflows/component_diff_check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
cat ./output/text
3636
3737
- name: Upload artifacts
38-
uses: actions/upload-artifact@v2
38+
uses: actions/upload-artifact@v4
3939
with:
4040
name: artifacts
4141
path: output/
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
project 'client-tools-runtime-2023.8.x' do |proj|
2+
proj.setting(:openssl_version, '3.0')
3+
4+
# Common settings
5+
instance_eval File.read(File.join(File.dirname(__FILE__), '_shared-client-tools-runtime.rb'))
6+
end
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
project 'pe-bolt-server-runtime-2023.8.x' do |proj|
2+
proj.setting(:pe_version, '2023.8')
3+
proj.setting(:rubygem_puppet_version, '8.8.1')
4+
# 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
5+
# 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
6+
# Once we are no longer using ruby 2.5 we can update.
7+
proj.setting(:no_doc, true)
8+
9+
proj.setting(:ruby_version, '3.2.5')
10+
proj.setting(:openssl_version, '3.0')
11+
12+
# We enable legacy algorithms for winrm transport. Currently the winrm transport
13+
# does not work on FIPS, so in order to stay compliant we do not enable legacy algorithms
14+
# on fips builds.
15+
if proj.get_platform.name =~ /^redhatfips/
16+
proj.setting(:use_legacy_openssl_algos, false)
17+
else
18+
proj.setting(:use_legacy_openssl_algos, true)
19+
end
20+
21+
instance_eval File.read(File.join(File.dirname(__FILE__), '_shared-pe-bolt-server_with_ruby.rb'))
22+
# These are ruby 3/puppet 8 specific gems. Some of them are "default/standard" gems. There
23+
# is a very annoying issue where default gems can be loaded by MRI but not jruby.
24+
# We explicitly pacakge up some default gems where we have explicit dependencies for jruby
25+
proj.component 'rubygem-prime'
26+
proj.component 'rubygem-rexml'
27+
proj.component 'rubygem-getoptlong'
28+
end
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
project 'pe-installer-runtime-2023.8.x' do |proj|
2+
proj.setting(:ruby_version, '3.2.5')
3+
proj.setting(:openssl_version, '3.0')
4+
# NLTM uses MD4 unconditionally in its protocol, so legacy algos must be
5+
# enabled in OpenSSL >= 3.0 for Bolt's WinRM transport to work.
6+
# We DO NOT WANT legacy algos enabled for the Puppet Agent runtime.
7+
proj.setting(:use_legacy_openssl_algos, true)
8+
9+
# rubygem-net-ssh included in shared-agent-components
10+
proj.setting(:rubygem_net_ssh_version, '7.2.3')
11+
proj.setting(:rubygem_puppet_version, '8.8.1')
12+
instance_eval File.read(File.join(File.dirname(__FILE__), '_shared-pe-installer-runtime.rb'))
13+
end

0 commit comments

Comments
 (0)