beaker-pe 3.6.0 → 3.6.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.
- checksums.yaml +4 -4
- data/CHANGELOG.md +8 -0
- data/lib/beaker-pe/install/pe_utils.rb +34 -3
- data/lib/beaker-pe/version.rb +1 -1
- data/spec/beaker-pe/install/pe_utils_spec.rb +38 -6
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: dfd1d8c42972081bb9b5f9f49d4f1cefd90424a84594dfdf1c96a136fa48d7d8
|
|
4
|
+
data.tar.gz: eff2646196013b1cf2ad368e4a5f4ce3fe4c6d5534dcf5425f5024dc1b508b53
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: '069a53cb8696fb530fe31c90cb3820408285a56894bfa62c6677dd4ea89a9e183a74dc1f1771bebb14bd1ec43af32457427d6b712eb5a0587a14e9a251df0efe'
|
|
7
|
+
data.tar.gz: f3053f4e7d7a3a1aae929b40448e8c60357e814cd8bedc91a3d165d899932410575f11d02c3ca3f6a3ed65d7b95db32292278abcbb7a035ceca0012ac3a16958
|
data/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,13 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## [3.6.1](https://github.com/puppetlabs/beaker-pe/tree/3.6.1) (2025-11-21)
|
|
4
|
+
|
|
5
|
+
[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.6.0...3.6.1)
|
|
6
|
+
|
|
7
|
+
**Implemented enhancements:**
|
|
8
|
+
|
|
9
|
+
- \[PE-41604\]: Update Solaris 10 SPARC package installation method in PE Utils [\#291](https://github.com/puppetlabs/beaker-pe/pull/291) ([span786](https://github.com/span786))
|
|
10
|
+
|
|
3
11
|
## [3.6.0](https://github.com/puppetlabs/beaker-pe/tree/3.6.0) (2025-11-20)
|
|
4
12
|
|
|
5
13
|
[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.5.0...3.6.0)
|
|
@@ -349,9 +349,40 @@ module Beaker
|
|
|
349
349
|
# Since sol10-sparc builds are not available in PE, download from agent-downloads.
|
|
350
350
|
vars = agent_package_common_vars(puppet_agent_ver, opts)
|
|
351
351
|
path = "#{vars[:agent_downloads_url]}/#{puppet_agent_ver}/repos/solaris/10/#{vars[:stream]}"
|
|
352
|
-
filename = "puppet-agent-#{vars[:master_aio_version]}-1.sparc"
|
|
353
|
-
|
|
354
|
-
|
|
352
|
+
filename = "puppet-agent-#{vars[:master_aio_version]}-1.sparc.pkg.gz"
|
|
353
|
+
vanagon_noask = <<-NOASK
|
|
354
|
+
# Write the noask file to a temporary directory
|
|
355
|
+
# please see man -s 4 admin for details about this file:
|
|
356
|
+
# http://www.opensolarisforum.org/man/man4/admin.html
|
|
357
|
+
#
|
|
358
|
+
# The key thing we don\'t want to prompt for are conflicting files.
|
|
359
|
+
# The other nocheck settings are mostly defensive to prevent prompts
|
|
360
|
+
# We _do_ want to check for available free space and abort if there is
|
|
361
|
+
# not enough
|
|
362
|
+
mail=
|
|
363
|
+
# Overwrite already installed instances
|
|
364
|
+
instance=overwrite
|
|
365
|
+
# Do not bother checking for partially installed packages
|
|
366
|
+
partial=nocheck
|
|
367
|
+
# Do not bother checking the runlevel
|
|
368
|
+
runlevel=nocheck
|
|
369
|
+
# Do not bother checking package dependencies (We take care of this)
|
|
370
|
+
idepend=nocheck
|
|
371
|
+
rdepend=nocheck
|
|
372
|
+
# DO check for available free space and abort if there isn\'t enough
|
|
373
|
+
space=quit
|
|
374
|
+
# Do not check for setuid files.
|
|
375
|
+
setuid=nocheck
|
|
376
|
+
# Do not check if files conflict with other packages
|
|
377
|
+
conflict=nocheck
|
|
378
|
+
# We have no action scripts. Do not check for them.
|
|
379
|
+
action=nocheck
|
|
380
|
+
# Install to the default base directory.
|
|
381
|
+
basedir=default
|
|
382
|
+
NOASK
|
|
383
|
+
|
|
384
|
+
host.execute("echo \"#{vanagon_noask}\" > /var/tmp/vanagon-noask")
|
|
385
|
+
host.execute("curl --output #{filename} #{path}/#{filename} && gunzip -c #{filename} | pkgadd -d /dev/stdin -a /var/tmp/vanagon-noask all")
|
|
355
386
|
end
|
|
356
387
|
|
|
357
388
|
# Determine the build package to download on a sles-11 (Intel) host, install that package onto the host.
|
data/lib/beaker-pe/version.rb
CHANGED
|
@@ -1692,19 +1692,51 @@ describe ClassMixedWithDSLInstallUtils do
|
|
|
1692
1692
|
{ :puppet_collection => 'puppet8' }
|
|
1693
1693
|
}
|
|
1694
1694
|
let(:stream) { opts[:puppet_collection] }
|
|
1695
|
-
let(:puppet_agent_ver) { '8.
|
|
1695
|
+
let(:puppet_agent_ver) { '8.16.0' }
|
|
1696
1696
|
let(:agent_downloads_url) { "http://agent-downloads.delivery.puppetlabs.net/puppet-agent" }
|
|
1697
|
-
let(:master_version) { '8.
|
|
1697
|
+
let(:master_version) { '8.16.0' }
|
|
1698
1698
|
let(:path) { "#{agent_downloads_url}/#{puppet_agent_ver}/repos/solaris/10/#{stream}" }
|
|
1699
|
-
let(:filename) { "puppet-agent-#{master_version}-1.sparc" }
|
|
1700
|
-
let(:
|
|
1701
|
-
let(:
|
|
1699
|
+
let(:filename) { "puppet-agent-#{master_version}-1.sparc.pkg.gz" }
|
|
1700
|
+
let(:url) { "#{path}/#{filename}" }
|
|
1701
|
+
let(:vanagon_noask) do
|
|
1702
|
+
<<-NOASK
|
|
1703
|
+
# Write the noask file to a temporary directory
|
|
1704
|
+
# please see man -s 4 admin for details about this file:
|
|
1705
|
+
# http://www.opensolarisforum.org/man/man4/admin.html
|
|
1706
|
+
#
|
|
1707
|
+
# The key thing we don\'t want to prompt for are conflicting files.
|
|
1708
|
+
# The other nocheck settings are mostly defensive to prevent prompts
|
|
1709
|
+
# We _do_ want to check for available free space and abort if there is
|
|
1710
|
+
# not enough
|
|
1711
|
+
mail=
|
|
1712
|
+
# Overwrite already installed instances
|
|
1713
|
+
instance=overwrite
|
|
1714
|
+
# Do not bother checking for partially installed packages
|
|
1715
|
+
partial=nocheck
|
|
1716
|
+
# Do not bother checking the runlevel
|
|
1717
|
+
runlevel=nocheck
|
|
1718
|
+
# Do not bother checking package dependencies (We take care of this)
|
|
1719
|
+
idepend=nocheck
|
|
1720
|
+
rdepend=nocheck
|
|
1721
|
+
# DO check for available free space and abort if there isn\'t enough
|
|
1722
|
+
space=quit
|
|
1723
|
+
# Do not check for setuid files.
|
|
1724
|
+
setuid=nocheck
|
|
1725
|
+
# Do not check if files conflict with other packages
|
|
1726
|
+
conflict=nocheck
|
|
1727
|
+
# We have no action scripts. Do not check for them.
|
|
1728
|
+
action=nocheck
|
|
1729
|
+
# Install to the default base directory.
|
|
1730
|
+
basedir=default
|
|
1731
|
+
NOASK
|
|
1732
|
+
end
|
|
1702
1733
|
|
|
1703
1734
|
it 'generates the correct url to download the package' do
|
|
1704
1735
|
allow( subject ).to receive( :puppet_fact ).and_return( master_version )
|
|
1705
1736
|
allow( subject ).to receive( :master ).and_return( {} )
|
|
1706
1737
|
|
|
1707
|
-
expect( hosts[5] ).to receive( :
|
|
1738
|
+
expect( hosts[5] ).to receive( :execute ).with( "echo \"#{vanagon_noask}\" > /var/tmp/vanagon-noask" ).once
|
|
1739
|
+
expect( hosts[5] ).to receive( :execute ).with( "curl --output #{filename} #{url} && gunzip -c #{filename} | pkgadd -d /dev/stdin -a /var/tmp/vanagon-noask all" ).once
|
|
1708
1740
|
subject.install_pkg_on_sol10_sparc_host(hosts[5], puppet_agent_ver, opts)
|
|
1709
1741
|
end
|
|
1710
1742
|
end
|