beaker-puppet 1.25.0 → 1.26.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +28 -0
- data/lib/beaker-puppet/install_utils/foss_defaults.rb +11 -11
- data/lib/beaker-puppet/install_utils/foss_utils.rb +12 -6
- data/lib/beaker-puppet/install_utils/puppet5.rb +1 -1
- data/lib/beaker-puppet/version.rb +1 -1
- data/setup/common/003_solaris_cert_fix.rb +52 -13
- data/spec/beaker-puppet/install_utils/foss_utils_spec.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: ebee2d6dab945dc437d7af314caa7b5667ebe4912d229d311b06868f0f791519
|
4
|
+
data.tar.gz: 8b34f260a93353ee742c344ff39986e102054884165024ca5a91b82b14616c78
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 25eb49dfcb68e27cb9d44d57bf439d640a8e29b5173427139f2d18867729ec6a5449d135cec25b7e6ba74aeb804639ddc120f899822253f339abc36b96a61035
|
7
|
+
data.tar.gz: '03834218105e8e4d38a5b0f9477ab51a1a94925011127ff33b1b1e2ba985dde7543a5ecab2519eee05b96c3724861902e54d6f0def5e927a3b07f5c615d142d3'
|
data/CHANGELOG.md
CHANGED
@@ -2,6 +2,34 @@
|
|
2
2
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
4
4
|
|
5
|
+
## [1.26.2](https://github.com/voxpupuli/beaker-puppet/tree/1.26.2) (2022-05-31)
|
6
|
+
|
7
|
+
[Full Changelog](https://github.com/voxpupuli/beaker-puppet/compare/1.26.1...1.26.2)
|
8
|
+
|
9
|
+
**Merged pull requests:**
|
10
|
+
|
11
|
+
- \(PA-4178\) Only clear and add non-default gem sources [\#190](https://github.com/voxpupuli/beaker-puppet/pull/190) ([joshcooper](https://github.com/joshcooper))
|
12
|
+
|
13
|
+
## [1.26.1](https://github.com/voxpupuli/beaker-puppet/tree/1.26.1) (2022-03-24)
|
14
|
+
|
15
|
+
[Full Changelog](https://github.com/voxpupuli/beaker-puppet/compare/1.26.0...1.26.1)
|
16
|
+
|
17
|
+
**Implemented enhancements:**
|
18
|
+
|
19
|
+
- \(maint\) Adds CA to Solaris 11 SPARC setup [\#186](https://github.com/voxpupuli/beaker-puppet/pull/186) ([mhashizume](https://github.com/mhashizume))
|
20
|
+
|
21
|
+
**Fixed bugs:**
|
22
|
+
|
23
|
+
- \(maint\) Fixes Solaris cert setup step [\#188](https://github.com/voxpupuli/beaker-puppet/pull/188) ([mhashizume](https://github.com/mhashizume))
|
24
|
+
|
25
|
+
**Merged pull requests:**
|
26
|
+
|
27
|
+
- \(PA-4332\) Changes download links to HTTPS [\#185](https://github.com/voxpupuli/beaker-puppet/pull/185) ([mhashizume](https://github.com/mhashizume))
|
28
|
+
|
29
|
+
## [1.26.0](https://github.com/voxpupuli/beaker-puppet/tree/1.26.0) (2022-03-23)
|
30
|
+
|
31
|
+
[Full Changelog](https://github.com/voxpupuli/beaker-puppet/compare/1.25.0...1.26.0)
|
32
|
+
|
5
33
|
## [1.25.0](https://github.com/voxpupuli/beaker-puppet/tree/1.25.0) (2022-03-16)
|
6
34
|
|
7
35
|
[Full Changelog](https://github.com/voxpupuli/beaker-puppet/compare/1.24.0...1.25.0)
|
@@ -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 => "
|
12
|
-
:mac_download_url => "
|
13
|
-
:pe_promoted_builds_url => "
|
14
|
-
:release_apt_repo_url => "
|
15
|
-
:release_yum_repo_url => "
|
16
|
-
:nightly_builds_url => "
|
17
|
-
:nightly_apt_repo_url => "
|
18
|
-
:nightly_yum_repo_url => "
|
19
|
-
:nightly_win_download_url => "
|
20
|
-
:nightly_mac_download_url => "
|
21
|
-
:dev_builds_url => "
|
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
|
@@ -1625,12 +1625,18 @@ module Beaker
|
|
1625
1625
|
# Configures gem sources on hosts to use a mirror, if specified
|
1626
1626
|
# This is a duplicate of the Gemfile logic.
|
1627
1627
|
def configure_gem_mirror(hosts)
|
1628
|
-
gem_source = ENV['GEM_SOURCE']
|
1629
|
-
|
1630
|
-
|
1631
|
-
|
1632
|
-
|
1633
|
-
|
1628
|
+
gem_source = ENV['GEM_SOURCE']
|
1629
|
+
|
1630
|
+
# Newer versions of rubygems always default the source to https://rubygems.org
|
1631
|
+
# and versions >= 3.1 will try to prompt (and fail) if you add a source that is
|
1632
|
+
# too similar to rubygems.org to prevent typo squatting:
|
1633
|
+
# https://github.com/rubygems/rubygems/commit/aa967b85dd96bbfb350f104125f23d617e82a00a
|
1634
|
+
if gem_source && gem_source !~ /rubygems\.org/
|
1635
|
+
Array(hosts).each do |host|
|
1636
|
+
gem = gem_command(host)
|
1637
|
+
on host, "#{gem} source --clear-all"
|
1638
|
+
on(host, "#{gem} source --add #{gem_source}")
|
1639
|
+
end
|
1634
1640
|
end
|
1635
1641
|
end
|
1636
1642
|
end
|
@@ -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 = '
|
10
|
+
DEFAULT_DEV_BUILDS_URL = 'https://builds.delivery.puppetlabs.net'
|
11
11
|
|
12
12
|
# grab build json from the builds server
|
13
13
|
#
|
@@ -38,19 +38,58 @@ 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
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
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
|
55
94
|
end
|
56
95
|
end
|
@@ -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: "
|
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.
|
4
|
+
version: 1.26.2
|
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-
|
11
|
+
date: 2022-05-31 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rspec
|
@@ -269,7 +269,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
269
269
|
- !ruby/object:Gem::Version
|
270
270
|
version: '0'
|
271
271
|
requirements: []
|
272
|
-
rubygems_version: 3.2.
|
272
|
+
rubygems_version: 3.2.33
|
273
273
|
signing_key:
|
274
274
|
specification_version: 4
|
275
275
|
summary: Beaker's Puppet DSL Extension Helpers!
|