beaker-pe 3.0.0 → 3.0.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/release.yml +0 -21
- data/CHANGELOG.md +16 -0
- data/Gemfile.lock +7 -7
- data/lib/beaker-pe/install/pe_utils.rb +24 -2
- data/lib/beaker-pe/version.rb +1 -1
- data/spec/beaker-pe/install/pe_utils_spec.rb +30 -4
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 209f3aa5584202191cc0019cc8fbe7b2353c2a7ffa2684803f5b2692ac3b0541
|
4
|
+
data.tar.gz: 74e042743384131201bdabf2bfbd2f62234c54672b48c7292aeca31c7edac0fe
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b7535b2327e337c7f273f430d2b6cfcd6f33a27735e5def97f71e0f5969b32dc98da6918bb6743257883cf47d2afa8cb7ed38632e517d13815b60f3ba55355fb
|
7
|
+
data.tar.gz: e421b964edb3395887ab85cc239b8daee1abbb04a2763568dd2c7dce817882094f6e259e921a80b7432672387516b17cbd093de1873cb7fee584f7ca16fb2028
|
@@ -36,27 +36,6 @@ jobs:
|
|
36
36
|
return response.tag_name
|
37
37
|
result-encoding: string
|
38
38
|
|
39
|
-
- name: Generate Changelog
|
40
|
-
uses: docker://githubchangeloggenerator/github-changelog-generator:1.16.2
|
41
|
-
with:
|
42
|
-
args: >-
|
43
|
-
--future-release ${{ steps.nv.outputs.version }}
|
44
|
-
env:
|
45
|
-
CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
46
|
-
|
47
|
-
- name: Validate Changelog
|
48
|
-
run : |
|
49
|
-
set -e
|
50
|
-
if output=$(git status --porcelain) && [ ! -z "$output" ]; then
|
51
|
-
echo "Here is the current git status:"
|
52
|
-
git status
|
53
|
-
echo
|
54
|
-
echo "The following changes were detected:"
|
55
|
-
git --no-pager diff
|
56
|
-
echo "Uncommitted PRs found in the changelog. Please submit a release prep PR of changes after running './release-prep'"
|
57
|
-
exit 1
|
58
|
-
fi
|
59
|
-
|
60
39
|
- name: Generate Release Notes
|
61
40
|
uses: docker://githubchangeloggenerator/github-changelog-generator:1.16.2
|
62
41
|
with:
|
data/CHANGELOG.md
CHANGED
@@ -1,5 +1,21 @@
|
|
1
1
|
# Changelog
|
2
2
|
|
3
|
+
## [3.0.1](https://github.com/puppetlabs/beaker-pe/tree/3.0.1) (2024-04-08)
|
4
|
+
|
5
|
+
[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.0.0...3.0.1)
|
6
|
+
|
7
|
+
**Implemented enhancements:**
|
8
|
+
|
9
|
+
- \(PE-37704\) Allow for SLES-11 \(Intel\) builds to be installed in PE 2021.7.x for testing [\#259](https://github.com/puppetlabs/beaker-pe/pull/259) ([shubhamshinde360](https://github.com/shubhamshinde360))
|
10
|
+
|
11
|
+
**Merged pull requests:**
|
12
|
+
|
13
|
+
- Bump yard from 0.9.35 to 0.9.36 [\#258](https://github.com/puppetlabs/beaker-pe/pull/258) ([dependabot[bot]](https://github.com/apps/dependabot))
|
14
|
+
- Bump rack from 2.2.8 to 2.2.8.1 [\#257](https://github.com/puppetlabs/beaker-pe/pull/257) ([dependabot[bot]](https://github.com/apps/dependabot))
|
15
|
+
- Bump yard from 0.9.34 to 0.9.35 [\#256](https://github.com/puppetlabs/beaker-pe/pull/256) ([dependabot[bot]](https://github.com/apps/dependabot))
|
16
|
+
- Bump activesupport from 7.1.3 to 7.1.3.2 [\#255](https://github.com/puppetlabs/beaker-pe/pull/255) ([dependabot[bot]](https://github.com/apps/dependabot))
|
17
|
+
- Bump scooter from 4.5.0 to 4.5.4 [\#254](https://github.com/puppetlabs/beaker-pe/pull/254) ([dependabot[bot]](https://github.com/apps/dependabot))
|
18
|
+
|
3
19
|
## [3.0.0](https://github.com/puppetlabs/beaker-pe/tree/3.0.0) (2024-02-07)
|
4
20
|
|
5
21
|
[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/2.16.0...3.0.0)
|
data/Gemfile.lock
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
beaker-pe (3.0.
|
4
|
+
beaker-pe (3.0.1)
|
5
5
|
beaker (>= 4.0, < 6)
|
6
6
|
beaker-abs
|
7
7
|
beaker-answers (~> 1.0)
|
@@ -12,7 +12,7 @@ PATH
|
|
12
12
|
GEM
|
13
13
|
remote: https://rubygems.org/
|
14
14
|
specs:
|
15
|
-
activesupport (7.1.3)
|
15
|
+
activesupport (7.1.3.2)
|
16
16
|
base64
|
17
17
|
bigdecimal
|
18
18
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
@@ -119,8 +119,8 @@ GEM
|
|
119
119
|
textutils (>= 0.10.0)
|
120
120
|
method_source (1.0.0)
|
121
121
|
minitar (0.9)
|
122
|
-
minitest (5.
|
123
|
-
multipart-post (2.
|
122
|
+
minitest (5.22.2)
|
123
|
+
multipart-post (2.4.0)
|
124
124
|
mutex_m (0.2.0)
|
125
125
|
net-ldap (0.19.0)
|
126
126
|
net-scp (4.0.0)
|
@@ -135,7 +135,7 @@ GEM
|
|
135
135
|
pry (0.14.2)
|
136
136
|
coderay (~> 1.1)
|
137
137
|
method_source (~> 1.0)
|
138
|
-
rack (2.2.8)
|
138
|
+
rack (2.2.8.1)
|
139
139
|
rake (13.1.0)
|
140
140
|
require_all (3.0.0)
|
141
141
|
rexml (3.2.6)
|
@@ -161,7 +161,7 @@ GEM
|
|
161
161
|
ast
|
162
162
|
ruby2_keywords (0.0.5)
|
163
163
|
rubyzip (2.3.2)
|
164
|
-
scooter (4.5.
|
164
|
+
scooter (4.5.4)
|
165
165
|
beaker
|
166
166
|
faraday
|
167
167
|
faraday-cookie_jar (>= 0.0.7)
|
@@ -193,7 +193,7 @@ GEM
|
|
193
193
|
vmfloaty (1.8.1)
|
194
194
|
commander (>= 4.4.3, < 4.7.0)
|
195
195
|
faraday (~> 1.5, >= 1.5.1)
|
196
|
-
yard (0.9.
|
196
|
+
yard (0.9.36)
|
197
197
|
|
198
198
|
PLATFORMS
|
199
199
|
aarch64-linux
|
@@ -325,6 +325,24 @@ module Beaker
|
|
325
325
|
end
|
326
326
|
end
|
327
327
|
|
328
|
+
# Determine the build package to download on a sles-11 (Intel) host, install that package onto the host.
|
329
|
+
# Assumed file name format: puppet-agent-7.29.1.26.gf344eeefa-1.sles11.x86_64.rpm.
|
330
|
+
# This method should be called after puppet is installed on the master since it relies on the master
|
331
|
+
# telling it the puppet agent version to form the download URL.
|
332
|
+
# @param [Host] host The sles-11 host to download and install the package on.
|
333
|
+
# @param [Hash{Symbol=>Symbol, String}] opts The options
|
334
|
+
# @api private
|
335
|
+
def install_rpm_on_sles11_host(host, puppet_agent_ver, opts)
|
336
|
+
# Since sles11 builds are not available in PE, download from agent-downloads.
|
337
|
+
agent_downloads_url = "http://agent-downloads.delivery.puppetlabs.net/puppet-agent"
|
338
|
+
master_aio_version = puppet_fact(master, 'aio_agent_build')
|
339
|
+
stream = opts[:puppet_collection] || "puppet#{puppet_agent_ver[0]}"
|
340
|
+
path = "#{agent_downloads_url}/#{puppet_agent_ver}/repos/sles/11/#{stream}/x86_64"
|
341
|
+
filename = "puppet-agent-#{master_aio_version}-1.sles11.x86_64"
|
342
|
+
extension = ".rpm"
|
343
|
+
host.install_package_with_rpm("#{path}/#{filename}#{extension}")
|
344
|
+
end
|
345
|
+
|
328
346
|
#Determine the PE package to download/upload on a windows host, download/upload that package onto the host.
|
329
347
|
#Assumed file name format: puppet-enterprise-3.3.0-rc1-559-g97f0833.msi
|
330
348
|
# @param [Host] host The windows host to download/upload and unpack PE onto
|
@@ -920,8 +938,12 @@ module Beaker
|
|
920
938
|
:puppet_collection => host[:puppet_collection] || opts[:puppet_collection],
|
921
939
|
:pe_promoted_builds_url => host[:pe_promoted_builds_url] || opts[:pe_promoted_builds_url]
|
922
940
|
}
|
923
|
-
|
924
|
-
|
941
|
+
if host['platform'] =~ /sles-11/
|
942
|
+
install_rpm_on_sles11_host(host, install_params[:puppet_agent_version], opts)
|
943
|
+
else
|
944
|
+
install_params.delete(:pe_promoted_builds_url) if install_params[:pe_promoted_builds_url].nil?
|
945
|
+
install_puppet_agent_pe_promoted_repo_on(host, install_params)
|
946
|
+
end
|
925
947
|
# 1 since no certificate found and waitforcert disabled
|
926
948
|
acceptable_exit_codes = [0, 1]
|
927
949
|
acceptable_exit_codes << 2 if opts[:type] == :upgrade
|
data/lib/beaker-pe/version.rb
CHANGED
@@ -30,13 +30,14 @@ describe ClassMixedWithDSLInstallUtils do
|
|
30
30
|
let(:basic_hosts) { make_hosts( { :pe_ver => '3.0',
|
31
31
|
:platform => 'linux',
|
32
32
|
:roles => [ 'agent' ],
|
33
|
-
:type => 'pe'},
|
33
|
+
:type => 'pe'}, 5 ) }
|
34
34
|
let(:hosts) { basic_hosts[0][:roles] = ['master', 'database', 'dashboard']
|
35
35
|
basic_hosts[1][:platform] = 'windows'
|
36
36
|
basic_hosts[2][:platform] = 'osx-10.9-x86_64'
|
37
37
|
basic_hosts[3][:platform] = 'eos'
|
38
|
+
basic_hosts[4][:platform] = 'sles'
|
38
39
|
basic_hosts }
|
39
|
-
let(:hosts_sorted) { [ hosts[1], hosts[0], hosts[2], hosts[3] ] }
|
40
|
+
let(:hosts_sorted) { [ hosts[1], hosts[0], hosts[2], hosts[3], hosts[4] ] }
|
40
41
|
let(:winhost) { make_host( 'winhost', { :platform => 'windows',
|
41
42
|
:pe_ver => '3.0',
|
42
43
|
:type => 'pe',
|
@@ -55,7 +56,10 @@ describe ClassMixedWithDSLInstallUtils do
|
|
55
56
|
:type => 'pe',
|
56
57
|
:working_dir => '/tmp',
|
57
58
|
:dist => 'puppet-enterprise-3.7.1-rc0-78-gffc958f-eos-4-i386' } ) }
|
58
|
-
|
59
|
+
let(:sles11host) { make_host( 'sles11', { :platform => 'sles',
|
60
|
+
:pe_ver => '3.0',
|
61
|
+
:type => 'pe',
|
62
|
+
:working_dir => '/tmp'} ) }
|
59
63
|
let(:lei_hosts) { make_hosts( { :pe_ver => '3.0',
|
60
64
|
:platform => 'linux',
|
61
65
|
:roles => [ 'agent' ],
|
@@ -1637,8 +1641,30 @@ describe ClassMixedWithDSLInstallUtils do
|
|
1637
1641
|
subject.do_install([])
|
1638
1642
|
end
|
1639
1643
|
|
1644
|
+
context "install rpm file in sles host" do
|
1645
|
+
let(:opts) {
|
1646
|
+
{ :puppet_collection => 'puppet7' }
|
1647
|
+
}
|
1648
|
+
let(:stream) { opts[:puppet_collection] }
|
1649
|
+
let(:puppet_agent_ver) { '7.29.1.26' }
|
1650
|
+
let(:agent_downloads_url) { "http://agent-downloads.delivery.puppetlabs.net/puppet-agent" }
|
1651
|
+
let(:master_version) { '7.29.1.26.gf344eeefa' }
|
1652
|
+
let(:path) { "#{agent_downloads_url}/#{puppet_agent_ver}/repos/sles/11/#{stream}/x86_64" }
|
1653
|
+
let(:filename) { "puppet-agent-#{master_version}-1.sles11.x86_64" }
|
1654
|
+
let(:extension) { '.rpm' }
|
1655
|
+
let(:url) { "#{path}/#{filename}#{extension}" }
|
1656
|
+
|
1657
|
+
it "generates the correct url to download the package" do
|
1658
|
+
allow( subject ).to receive( :puppet_fact ).and_return( master_version )
|
1659
|
+
allow( subject ).to receive( :master ).and_return( {} )
|
1660
|
+
|
1661
|
+
expect( hosts[4] ).to receive( :install_package_with_rpm ).with( url ).once
|
1662
|
+
subject.install_rpm_on_sles11_host(hosts[4], puppet_agent_ver, opts)
|
1663
|
+
end
|
1664
|
+
end
|
1665
|
+
|
1640
1666
|
it 'can perform a simple installation' do
|
1641
|
-
expect(subject).to receive(:get_mco_setting).and_return({})
|
1667
|
+
expect(subject).to receive(:get_mco_setting).and_return({}).twice
|
1642
1668
|
allow( subject ).to receive( :verify_network_resources).with(hosts, nil)
|
1643
1669
|
allow( subject ).to receive( :on ).and_return( Beaker::Result.new( {}, '' ) )
|
1644
1670
|
allow( subject ).to receive( :fetch_pe ).and_return( true )
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: beaker-pe
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.0.
|
4
|
+
version: 3.0.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Puppetlabs
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2024-
|
11
|
+
date: 2024-04-11 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rspec
|