beaker-pe 2.16.0 → 2.17.0
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.
- checksums.yaml +4 -4
- data/.github/workflows/auto_release_prep.yml +12 -0
- data/.github/workflows/ensure_label.yml +8 -0
- data/.github/workflows/release.yml +1 -22
- data/.github/workflows/security.yml +1 -1
- data/CHANGELOG.md +37 -0
- data/Gemfile.lock +2 -2
- data/beaker-pe.gemspec +1 -1
- 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 +5 -9
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a0efb01c083ddc9e7947698d848ab5fc7678f72b9c59355baaada7298a43e13c
|
4
|
+
data.tar.gz: 4a7a4866472779a03ef8c76fdeffb4a58dd8c01c6164f43542b8f14020b533d7
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 7457fa9aff61c825c607c24159a46cbe42351222dfb891cbc2d30799805aa8a7a4074b409f7692d7fa2d8e8aa2351584b3637a302a81931e359ca31231316e10
|
7
|
+
data.tar.gz: d48ab5a2148e9e9cf2dcc081b4d18b9d004c53c4101f98da9e786bac0b7ef8bb487687e81ed76ed75e0f07d2c402c65b2bd356740df0c25db1848ac2082afa5b
|
@@ -0,0 +1,12 @@
|
|
1
|
+
name: Automated release prep
|
2
|
+
|
3
|
+
on:
|
4
|
+
workflow_dispatch:
|
5
|
+
|
6
|
+
jobs:
|
7
|
+
auto_release_prep:
|
8
|
+
uses: puppetlabs/release-engineering-repo-standards/.github/workflows/auto_release_prep.yml@v1
|
9
|
+
secrets: inherit
|
10
|
+
with:
|
11
|
+
project-type: ruby
|
12
|
+
version-file-path: lib/beaker-pe/version.rb
|
@@ -24,7 +24,7 @@ jobs:
|
|
24
24
|
echo "Found version $version from lib/beaker-pe/version.rb"
|
25
25
|
|
26
26
|
- name: Get Current Version
|
27
|
-
uses: actions/github-script@
|
27
|
+
uses: actions/github-script@v7
|
28
28
|
id: cv
|
29
29
|
with:
|
30
30
|
script: |
|
@@ -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:
|
@@ -22,7 +22,7 @@ jobs:
|
|
22
22
|
- name: check lock
|
23
23
|
run: '[ -f "Gemfile.lock" ] && echo "package lock file exists, skipping" || bundle lock'
|
24
24
|
# install java
|
25
|
-
- uses: actions/setup-java@
|
25
|
+
- uses: actions/setup-java@v4
|
26
26
|
with:
|
27
27
|
distribution: 'temurin' # See 'Supported distributions' for available options
|
28
28
|
java-version: '17'
|
data/CHANGELOG.md
CHANGED
@@ -1,5 +1,42 @@
|
|
1
1
|
# Changelog
|
2
2
|
|
3
|
+
## [2.16.1](https://github.com/puppetlabs/beaker-pe/tree/2.16.1) (2024-04-04)
|
4
|
+
|
5
|
+
[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.0.0...2.16.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
|
+
|
19
|
+
## [3.0.0](https://github.com/puppetlabs/beaker-pe/tree/3.0.0) (2024-02-07)
|
20
|
+
|
21
|
+
[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/2.16.0...3.0.0)
|
22
|
+
|
23
|
+
**Implemented enhancements:**
|
24
|
+
|
25
|
+
- Bump beaker from 4.40.2 to 4.41.1 [\#248](https://github.com/puppetlabs/beaker-pe/pull/248) ([dependabot[bot]](https://github.com/apps/dependabot))
|
26
|
+
- Bump scooter from 4.4.0 to 4.5.0 [\#242](https://github.com/puppetlabs/beaker-pe/pull/242) ([dependabot[bot]](https://github.com/apps/dependabot))
|
27
|
+
|
28
|
+
**Fixed bugs:**
|
29
|
+
|
30
|
+
- Bump beaker from 4.41.1 to 4.41.2 [\#249](https://github.com/puppetlabs/beaker-pe/pull/249) ([dependabot[bot]](https://github.com/apps/dependabot))
|
31
|
+
- Bump activesupport from 7.1.1 to 7.1.2 [\#240](https://github.com/puppetlabs/beaker-pe/pull/240) ([dependabot[bot]](https://github.com/apps/dependabot))
|
32
|
+
|
33
|
+
**Merged pull requests:**
|
34
|
+
|
35
|
+
- Bump rspec from 3.12.0 to 3.13.0 [\#253](https://github.com/puppetlabs/beaker-pe/pull/253) ([dependabot[bot]](https://github.com/apps/dependabot))
|
36
|
+
- Bump activesupport from 7.1.2 to 7.1.3 [\#251](https://github.com/puppetlabs/beaker-pe/pull/251) ([dependabot[bot]](https://github.com/apps/dependabot))
|
37
|
+
- Bump actions/setup-java from 3 to 4 [\#245](https://github.com/puppetlabs/beaker-pe/pull/245) ([dependabot[bot]](https://github.com/apps/dependabot))
|
38
|
+
- Bump actions/github-script from 6 to 7 [\#241](https://github.com/puppetlabs/beaker-pe/pull/241) ([dependabot[bot]](https://github.com/apps/dependabot))
|
39
|
+
|
3
40
|
## [2.16.0](https://github.com/puppetlabs/beaker-pe/tree/2.16.0) (2023-12-05)
|
4
41
|
|
5
42
|
[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/2.15.0...2.16.0)
|
data/Gemfile.lock
CHANGED
data/beaker-pe.gemspec
CHANGED
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
|
|
33
33
|
|
34
34
|
# Run time dependencies
|
35
35
|
s.add_runtime_dependency 'beaker', '>= 4.0', '< 6'
|
36
|
-
s.add_runtime_dependency 'beaker-puppet', '>=1'
|
36
|
+
s.add_runtime_dependency 'beaker-puppet', '>=1'
|
37
37
|
s.add_runtime_dependency 'stringify-hash', '~> 0.0.0'
|
38
38
|
s.add_runtime_dependency 'beaker-answers', '~> 0.0'
|
39
39
|
s.add_runtime_dependency 'beaker-abs'
|
@@ -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: 2.
|
4
|
+
version: 2.17.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Puppetlabs
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2024-05-22 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rspec
|
@@ -183,9 +183,6 @@ dependencies:
|
|
183
183
|
- - ">="
|
184
184
|
- !ruby/object:Gem::Version
|
185
185
|
version: '1'
|
186
|
-
- - "<"
|
187
|
-
- !ruby/object:Gem::Version
|
188
|
-
version: '3'
|
189
186
|
type: :runtime
|
190
187
|
prerelease: false
|
191
188
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -193,9 +190,6 @@ dependencies:
|
|
193
190
|
- - ">="
|
194
191
|
- !ruby/object:Gem::Version
|
195
192
|
version: '1'
|
196
|
-
- - "<"
|
197
|
-
- !ruby/object:Gem::Version
|
198
|
-
version: '3'
|
199
193
|
- !ruby/object:Gem::Dependency
|
200
194
|
name: stringify-hash
|
201
195
|
requirement: !ruby/object:Gem::Requirement
|
@@ -261,6 +255,8 @@ extensions: []
|
|
261
255
|
extra_rdoc_files: []
|
262
256
|
files:
|
263
257
|
- ".github/dependabot.yml"
|
258
|
+
- ".github/workflows/auto_release_prep.yml"
|
259
|
+
- ".github/workflows/ensure_label.yml"
|
264
260
|
- ".github/workflows/release.yml"
|
265
261
|
- ".github/workflows/security.yml"
|
266
262
|
- ".github/workflows/testing.yml"
|
@@ -327,7 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
327
323
|
- !ruby/object:Gem::Version
|
328
324
|
version: '0'
|
329
325
|
requirements: []
|
330
|
-
rubygems_version: 3.3.
|
326
|
+
rubygems_version: 3.3.27
|
331
327
|
signing_key:
|
332
328
|
specification_version: 4
|
333
329
|
summary: Beaker PE DSL Helpers!
|