beaker-puppet 1.25.0 → 1.26.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +10 -0
  3. data/lib/beaker-puppet/install_utils/foss_defaults.rb +11 -11
  4. data/lib/beaker-puppet/install_utils/puppet5.rb +1 -1
  5. data/lib/beaker-puppet/version.rb +1 -1
  6. data/setup/common/003_solaris_cert_fix.rb +51 -13
  7. data/spec/beaker-puppet/install_utils/foss_utils_spec.rb +1 -1
  8. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3573a547b543131e5debd257af0b1d2ea6b9ab279ee26768ee45834810afffc6
4
- data.tar.gz: d2e9b04f5b5b8b3a00e8601f25b6fc29a110446e50f1ad64bbdc953956715733
3
+ metadata.gz: 4d82a5d6c99272e6528c5300c892bba44d860797359dd6c7783478154e3d0de7
4
+ data.tar.gz: 9e9a836a635b02fafe2892728ac229c24d62deacda562709a6b938c67ccd9f11
5
5
  SHA512:
6
- metadata.gz: 786900d6635e7d08e8de92fba1c3b27257860b74778e5aa2ec531a401a5f323b9741649dbd7ea092188e3333623ecd876279e08a86b9d115b0681d5430e28645
7
- data.tar.gz: c6f6013263022331eb1f6bb87f9d3f6a0bc7462804354e3794725f226477e405a114e2bd5b9fea96c19821e66c7f3c5a0a7093b0a981985c2dd8906a60837805
6
+ metadata.gz: 96d997b09ccb8c865efa30064fe848bcf1b8c52248f84b29276bd1b27a0be12858473b9e2e9365d995a945783d54cab9cffc0670d8bcde4ce5897b0d5afa9100
7
+ data.tar.gz: 809a6331f440fc9d9513ef9b0f8a721dbbf00b036e0f8a409296ff47d49b4a40be205da56e822227844d12d92e644a6b8969943d0f529578987a5e3f8456305b
data/CHANGELOG.md CHANGED
@@ -2,6 +2,16 @@
2
2
 
3
3
  All notable changes to this project will be documented in this file.
4
4
 
5
+ ## [1.26.0](https://github.com/voxpupuli/beaker-puppet/tree/1.26.0) (2022-03-23)
6
+
7
+ [Full Changelog](https://github.com/voxpupuli/beaker-puppet/compare/1.25.0...1.26.0)
8
+
9
+ **Implemented enhancements:**
10
+
11
+ - \(maint\) Adds CA to Solaris 11 SPARC setup [\#186](https://github.com/voxpupuli/beaker-puppet/pull/186) ([mhashizume](https://github.com/mhashizume))
12
+
13
+ - \(PA-4332\) Changes download links to HTTPS [\#185](https://github.com/voxpupuli/beaker-puppet/pull/185) ([mhashizume](https://github.com/mhashizume))
14
+
5
15
  ## [1.25.0](https://github.com/voxpupuli/beaker-puppet/tree/1.25.0) (2022-03-16)
6
16
 
7
17
  [Full Changelog](https://github.com/voxpupuli/beaker-puppet/compare/1.24.0...1.25.0)
data/lib/beaker-puppet/install_utils/foss_defaults.rb CHANGED
@@ -8,17 +8,17 @@ module Beaker
8
8
 
9
9
  #Here be the default download URLs
10
10
  FOSS_DEFAULT_DOWNLOAD_URLS = {
11
- :win_download_url => "http://downloads.puppet.com/windows",
12
- :mac_download_url => "http://downloads.puppet.com/mac",
13
- :pe_promoted_builds_url => "http://pm.puppet.com",
14
- :release_apt_repo_url => "http://apt.puppet.com",
15
- :release_yum_repo_url => "http://yum.puppet.com",
16
- :nightly_builds_url => "http://nightlies.puppet.com",
17
- :nightly_apt_repo_url => "http://nightlies.puppet.com/apt",
18
- :nightly_yum_repo_url => "http://nightlies.puppet.com/yum",
19
- :nightly_win_download_url => "http://nightlies.puppet.com/downloads/windows",
20
- :nightly_mac_download_url => "http://nightlies.puppet.com/downloads/mac",
21
- :dev_builds_url => "http://builds.delivery.puppetlabs.net",
11
+ :win_download_url => "https://downloads.puppet.com/windows",
12
+ :mac_download_url => "https://downloads.puppet.com/mac",
13
+ :pe_promoted_builds_url => "https://pm.puppet.com",
14
+ :release_apt_repo_url => "https://apt.puppet.com",
15
+ :release_yum_repo_url => "https://yum.puppet.com",
16
+ :nightly_builds_url => "https://nightlies.puppet.com",
17
+ :nightly_apt_repo_url => "https://nightlies.puppet.com/apt",
18
+ :nightly_yum_repo_url => "https://nightlies.puppet.com/yum",
19
+ :nightly_win_download_url => "https://nightlies.puppet.com/downloads/windows",
20
+ :nightly_mac_download_url => "https://nightlies.puppet.com/downloads/mac",
21
+ :dev_builds_url => "https://builds.delivery.puppetlabs.net",
22
22
  }
23
23
 
24
24
  #Here be the pathing and default values for FOSS installs
data/lib/beaker-puppet/install_utils/puppet5.rb CHANGED
@@ -7,7 +7,7 @@ module Beaker
7
7
  include Beaker::DSL::InstallUtils::FOSSDefaults
8
8
 
9
9
  # Base URL for internal Puppet Inc. builds
10
- DEFAULT_DEV_BUILDS_URL = 'http://builds.delivery.puppetlabs.net'
10
+ DEFAULT_DEV_BUILDS_URL = 'https://builds.delivery.puppetlabs.net'
11
11
 
12
12
  # grab build json from the builds server
13
13
  #
data/lib/beaker-puppet/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module BeakerPuppet
2
- VERSION = '1.25.0'
2
+ VERSION = '1.26.0'
3
3
  end
data/setup/common/003_solaris_cert_fix.rb CHANGED
@@ -38,19 +38,57 @@ gKDWHrO8Dw9TdSmq6hN35N6MgSGtBxBHEa2HPQfRdbzP82Z+
38
38
  -----END CERTIFICATE-----
39
39
  EOM
40
40
 
41
+ USERTrust = <<-EOM
42
+ -----BEGIN CERTIFICATE-----
43
+ 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
69
+ Q+6IHdfGjjxDah2nGN59PRbxYvnKkKj9
70
+ -----END CERTIFICATE-----
71
+ EOM
72
+
41
73
  hosts.each do |host|
42
- if host.platform=~ /solaris-11(\.2)?-(i386|sparc)/
43
- create_remote_file(host, "DigiCertTrustedRootG4.crt.pem", DigiCert)
44
- on(host, 'chmod a+r /root/DigiCertTrustedRootG4.crt.pem')
45
- on(host, 'cp -p /root/DigiCertTrustedRootG4.crt.pem /etc/certs/CA/')
46
- on(host, 'rm /root/DigiCertTrustedRootG4.crt.pem')
47
- on(host, '/usr/sbin/svcadm restart /system/ca-certificates')
48
- timeout = 60
49
- counter = 0
50
- while on(host, 'svcs -x ca-certificates').output !~ /State: online/ do
51
- raise 'ca-certificates services failed start up' if counter > timeout
52
- sleep 5
53
- counter = counter + 5
54
- end
74
+ create_remote_file(host, "DigiCertTrustedRootG4.crt.pem", DigiCert)
75
+ on(host, 'chmod a+r /root/DigiCertTrustedRootG4.crt.pem')
76
+ on(host, 'cp -p /root/DigiCertTrustedRootG4.crt.pem /etc/certs/CA/')
77
+ on(host, 'rm /root/DigiCertTrustedRootG4.crt.pem')
78
+
79
+ if host.platform=~ /solaris-11-sparc/
80
+ create_remote_file(host, "USERTrust_RSA_Certification_Authority.pem", USERTrust)
81
+ on(host, 'chmod a+r /root/USERTrust_RSA_Certification_Authority.pem')
82
+ on(host, 'cp -p /root/USERTrust_RSA_Certification_Authority.pem /etc/certs/CA/')
83
+ on(host, 'rm /root/USERTrust_RSA_Certification_Authority.pem')
84
+ end
85
+
86
+ on(host, '/usr/sbin/svcadm restart /system/ca-certificates')
87
+ timeout = 60
88
+ counter = 0
89
+ while on(host, 'svcs -x ca-certificates').output !~ /State: online/ do
90
+ raise 'ca-certificates services failed start up' if counter > timeout
91
+ sleep 5
92
+ counter = counter + 5
55
93
  end
56
94
  end
data/spec/beaker-puppet/install_utils/foss_utils_spec.rb CHANGED
@@ -1493,7 +1493,7 @@ describe ClassMixedWithDSLInstallUtils do
1493
1493
 
1494
1494
  context 'with default arguments' do
1495
1495
  it "installs the latest puppetserver from the default 'puppet' release stream" do
1496
- expect(subject).to receive(:install_puppetlabs_release_repo_on).with(host, 'puppet', include(release_yum_repo_url: "http://yum.puppet.com"))
1496
+ expect(subject).to receive(:install_puppetlabs_release_repo_on).with(host, 'puppet', include(release_yum_repo_url: "https://yum.puppet.com"))
1497
1497
  expect(subject).to receive(:install_package).with(host, 'puppetserver', nil)
1498
1498
  subject.install_puppetserver_on(host)
1499
1499
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: beaker-puppet
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.25.0
4
+ version: 1.26.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Vox Pupuli
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-03-16 00:00:00.000000000 Z
11
+ date: 2022-03-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rspec