beaker-puppet 1.24.0 → 1.26.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +33 -1
  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 +95 -0
  7. data/spec/beaker-puppet/install_utils/foss_utils_spec.rb +1 -1
  8. data/tasks/ci.rake +1 -0
  9. metadata +3 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 5557cad6a494d24bd383c9583db5ce43546677ede516270f1c8c390a2951951b
4
- data.tar.gz: c0d92915ae1b5bcc059e4728a2699d3eac446de1c141fdc5487a553e34e3e89e
3
+ metadata.gz: 7881155eff720047edee385b9d3a8809eb9108a6b4a8e11804921db18aeb9cd5
4
+ data.tar.gz: 5b1e5543bd316c178d86ab7c6d7210d72827bf4637d308bba8f536392a2a77cf
5
5
  SHA512:
6
- metadata.gz: 81f04cba47d505b66eed94d1fdd9fb80bbe1d11d4d18b55edf238815405d8d030b0e6506ad44af2f523664f7d0a468fc635ec9a6cda99fc1b653962c1d30f551
7
- data.tar.gz: 5e691ffcaf6d56e408ee6be5acf025d1ae5605d1c5081fb9d095c948aa1968a9d67172d311932407567f6cd3b534b8267f19822606c3195d4bac17daa03af2bc
6
+ metadata.gz: e02efc2cebc7153164768360aa56bbe5fed898de6d0ebed8755a4551e53acee14d1c565a4314628cd9e7dd5f544f58dffc09cd29608f8d73c897c5264df9669b
7
+ data.tar.gz: 96a4681f9d4b2917c430c912df50a4bf334a28d57fab9648bf13eb9218955fd42f4df3deb601f05c5620ad91f3aaad5603cc786085e6791491e141e6110d74fe
data/CHANGELOG.md CHANGED
@@ -2,13 +2,45 @@
2
2
 
3
3
  All notable changes to this project will be documented in this file.
4
4
 
5
+ ## [1.26.1](https://github.com/voxpupuli/beaker-puppet/tree/1.26.1) (2022-03-24)
6
+
7
+ [Full Changelog](https://github.com/voxpupuli/beaker-puppet/compare/1.26.0...1.26.1)
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
+ **Fixed bugs:**
14
+
15
+ - \(maint\) Fixes Solaris cert setup step [\#188](https://github.com/voxpupuli/beaker-puppet/pull/188) ([mhashizume](https://github.com/mhashizume))
16
+
17
+ **Merged pull requests:**
18
+
19
+ - \(PA-4332\) Changes download links to HTTPS [\#185](https://github.com/voxpupuli/beaker-puppet/pull/185) ([mhashizume](https://github.com/mhashizume))
20
+
21
+ ## [1.26.0](https://github.com/voxpupuli/beaker-puppet/tree/1.26.0) (2022-03-23)
22
+
23
+ [Full Changelog](https://github.com/voxpupuli/beaker-puppet/compare/1.25.0...1.26.0)
24
+
25
+ ## [1.25.0](https://github.com/voxpupuli/beaker-puppet/tree/1.25.0) (2022-03-16)
26
+
27
+ [Full Changelog](https://github.com/voxpupuli/beaker-puppet/compare/1.24.0...1.25.0)
28
+
29
+ **Implemented enhancements:**
30
+
31
+ - \(PA-4331\) Add a step for updating Solaris CA Keystore [\#182](https://github.com/voxpupuli/beaker-puppet/pull/182) ([cthorn42](https://github.com/cthorn42))
32
+
33
+ **Fixed bugs:**
34
+
35
+ - \(PA-4331\) Fix the logic to only run on older solaris versions [\#183](https://github.com/voxpupuli/beaker-puppet/pull/183) ([cthorn42](https://github.com/cthorn42))
36
+
5
37
  ## [1.24.0](https://github.com/voxpupuli/beaker-puppet/tree/1.24.0) (2022-03-04)
6
38
 
7
39
  [Full Changelog](https://github.com/voxpupuli/beaker-puppet/compare/1.23.0...1.24.0)
8
40
 
9
41
  **Implemented enhancements:**
10
42
 
11
- - module setup on the target: Igrore files at the root level only [\#177](https://github.com/voxpupuli/beaker-puppet/pull/177) ([smortex](https://github.com/smortex))
43
+ - module setup on the target: Ignore files at the root level only [\#177](https://github.com/voxpupuli/beaker-puppet/pull/177) ([smortex](https://github.com/smortex))
12
44
 
13
45
  **Merged pull requests:**
14
46
 
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.24.0'
2
+ VERSION = '1.26.1'
3
3
  end
data/setup/common/003_solaris_cert_fix.rb ADDED
@@ -0,0 +1,95 @@
1
+ test_name 'Add digicert to solaris keystore'
2
+
3
+ # Only need to run this on soliars 11, 11.2, and sparc
4
+ skip_test 'No solaris 11 version that needed keystore updating' if ! hosts.any? { |host| host.platform=~ /solaris-11(\.2)?-(i386|sparc)/}
5
+
6
+ DigiCert = <<-EOM
7
+ -----BEGIN CERTIFICATE-----
8
+ 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
38
+ -----END CERTIFICATE-----
39
+ EOM
40
+
41
+ USERTrust = <<-EOM
42
+ -----BEGIN CERTIFICATE-----
43
+ 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
69
+ Q+6IHdfGjjxDah2nGN59PRbxYvnKkKj9
70
+ -----END CERTIFICATE-----
71
+ EOM
72
+
73
+ hosts.each do |host|
74
+ next unless host.platform =~ /solaris-11(\.2)?-(i386|sparc)/
75
+ create_remote_file(host, "DigiCertTrustedRootG4.crt.pem", DigiCert)
76
+ on(host, 'chmod a+r /root/DigiCertTrustedRootG4.crt.pem')
77
+ on(host, 'cp -p /root/DigiCertTrustedRootG4.crt.pem /etc/certs/CA/')
78
+ on(host, 'rm /root/DigiCertTrustedRootG4.crt.pem')
79
+
80
+ if host.platform=~ /solaris-11-sparc/
81
+ create_remote_file(host, "USERTrust_RSA_Certification_Authority.pem", USERTrust)
82
+ on(host, 'chmod a+r /root/USERTrust_RSA_Certification_Authority.pem')
83
+ on(host, 'cp -p /root/USERTrust_RSA_Certification_Authority.pem /etc/certs/CA/')
84
+ on(host, 'rm /root/USERTrust_RSA_Certification_Authority.pem')
85
+ end
86
+
87
+ on(host, '/usr/sbin/svcadm restart /system/ca-certificates')
88
+ timeout = 60
89
+ counter = 0
90
+ while on(host, 'svcs -x ca-certificates').output !~ /State: online/ do
91
+ raise 'ca-certificates services failed start up' if counter > timeout
92
+ sleep 5
93
+ counter = counter + 5
94
+ end
95
+ 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
data/tasks/ci.rake CHANGED
@@ -311,6 +311,7 @@ def pre_suites(type)
311
311
  when :aio
312
312
  [
313
313
  "#{beaker_root}/setup/common/000-delete-puppet-when-none.rb",
314
+ "#{beaker_root}/setup/common/003_solaris_cert_fix.rb",
314
315
  "#{beaker_root}/setup/aio/010_Install_Puppet_Agent.rb",
315
316
  "#{beaker_root}/setup/common/011_Install_Puppet_Server.rb",
316
317
  "#{beaker_root}/setup/common/012_Finalize_Installs.rb",
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.24.0
4
+ version: 1.26.1
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-04 00:00:00.000000000 Z
11
+ date: 2022-03-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rspec
@@ -220,6 +220,7 @@ files:
220
220
  - lib/beaker/dsl/install_utils/puppet_utils.rb
221
221
  - setup/aio/010_Install_Puppet_Agent.rb
222
222
  - setup/common/000-delete-puppet-when-none.rb
223
+ - setup/common/003_solaris_cert_fix.rb
223
224
  - setup/common/011_Install_Puppet_Server.rb
224
225
  - setup/common/012_Finalize_Installs.rb
225
226
  - setup/common/020_InstallCumulusModules.rb