beaker-puppet 4.4.0 → 4.4.2

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 9550702c6d716314a7b9179bab920677bdb138682f4cfc987016358f3c235a7a
4
- data.tar.gz: 4012d51a38a891bdc972c8e20b763e91a9d38c2a1e849ecd844b7c5c44cf02e4
3
+ metadata.gz: c7e6d038ac57aef64b353df0164ffc60deaa271b12ac273484e9b3af2ef15008
4
+ data.tar.gz: 4b79a68287b4b82c9fa322c8020e31c54cac11d5aee4dbd37c470eb0bd655a6c
5
5
  SHA512:
6
- metadata.gz: b91e0c80b3586231ba368379eec41a30391ccba6f6376c4d054a6f98478063889bb857d3d4510fb832334d919d40d825bc34a563621c290d766652418cd174d5
7
- data.tar.gz: bbae6817a904367f2dd12a4b02ea5fd5e72a275d303435f63a88aa1859a3974743480ccbeeeb65584c7ba83898959954d90e312eaccdfcd0616542f37133f26a
6
+ metadata.gz: 63f4933b686b1d43dc520575b752f4f4267e97a3b8646debc04707a6efd04405d366aa6da5d5fbee2ad1eafc97dcb669e8e0fae3121448c149f253f0491ccbed
7
+ data.tar.gz: 339bcc300c9ee16b5157cceb6fa933d95f57062738a5153dec963a64a91d7b39b42d502d86046d00e2e6c48bcf4d7db9c6682ab69abfe7941fa3bc060fcc8f27
data/CHANGELOG.md CHANGED
@@ -1,14 +1,25 @@
1
1
  # Changelog
2
2
 
3
- All notable changes to this project will be documented in this file.
3
+ ## [4.4.2](https://github.com/puppetlabs/beaker-puppet/tree/4.4.2) (2026-08-12)
4
4
 
5
- ## [4.4.0](https://github.com/puppetlabs/beaker-puppet/tree/4.4.0) (2026-02-24)
5
+ [Full Changelog](https://github.com/puppetlabs/beaker-puppet/compare/4.4.1...4.4.2)
6
6
 
7
- [Full Changelog](https://github.com/puppetlabs/beaker-puppet/compare/4.3.0...4.4.0)
7
+ **Fixed bugs:**
8
8
 
9
- **Implemented enhancements:**
9
+ - \(PE-45697\) Fall back to the ssl check when PuppetDB's cleartext status port is unavailable [\#278](https://github.com/puppetlabs/beaker-puppet/pull/278) ([jonathannewman](https://github.com/jonathannewman))
10
+ - \(maint\) Update GitHubSig to current GitHub RSA host key [\#277](https://github.com/puppetlabs/beaker-puppet/pull/277) ([Magisus](https://github.com/Magisus))
11
+
12
+ ## [4.4.1](https://github.com/puppetlabs/beaker-puppet/tree/4.4.1) (2026-03-20)
10
13
 
11
- - beaker: Allow 7.x [\#272](https://github.com/puppetlabs/beaker-puppet/pull/272) ([bastelfreak](https://github.com/bastelfreak))
14
+ [Full Changelog](https://github.com/puppetlabs/beaker-puppet/compare/4.4.0...4.4.1)
15
+
16
+ **Fixed bugs:**
17
+
18
+ - \(PA-8312\) Skip gem source add for Solaris & AIX [\#274](https://github.com/puppetlabs/beaker-puppet/pull/274) ([cthorn42](https://github.com/cthorn42))
19
+
20
+ ## [4.4.0](https://github.com/puppetlabs/beaker-puppet/tree/4.4.0) (2026-02-24)
21
+
22
+ [Full Changelog](https://github.com/puppetlabs/beaker-puppet/compare/4.3.0...4.4.0)
12
23
 
13
24
  ## [4.3.0](https://github.com/puppetlabs/beaker-puppet/tree/4.3.0) (2026-01-06)
14
25
 
@@ -19,6 +30,10 @@ All notable changes to this project will be documented in this file.
19
30
  - Add Ruby 4.0 support [\#271](https://github.com/puppetlabs/beaker-puppet/pull/271) ([bastelfreak](https://github.com/bastelfreak))
20
31
  - Add Ruby 3.4 support [\#269](https://github.com/puppetlabs/beaker-puppet/pull/269) ([bastelfreak](https://github.com/bastelfreak))
21
32
 
33
+ **Closed issues:**
34
+
35
+ - Drop inifile dependency [\#206](https://github.com/puppetlabs/beaker-puppet/issues/206)
36
+
22
37
  ## [4.2.0](https://github.com/puppetlabs/beaker-puppet/tree/4.2.0) (2025-01-17)
23
38
 
24
39
  [Full Changelog](https://github.com/puppetlabs/beaker-puppet/compare/4.1.1...4.2.0)
@@ -49,13 +64,17 @@ All notable changes to this project will be documented in this file.
49
64
 
50
65
  ## [4.0.0](https://github.com/puppetlabs/beaker-puppet/tree/4.0.0) (2024-05-29)
51
66
 
52
- [Full Changelog](https://github.com/puppetlabs/beaker-puppet/compare/3.0.1...4.0.0)
67
+ [Full Changelog](https://github.com/puppetlabs/beaker-puppet/compare/2.1.0...4.0.0)
53
68
 
54
69
  **Breaking changes:**
55
70
 
56
71
  - Add support for Beaker 6 [\#255](https://github.com/puppetlabs/beaker-puppet/pull/255) ([mhashizume](https://github.com/mhashizume))
57
72
  - Remove unsupported network platforms [\#254](https://github.com/puppetlabs/beaker-puppet/pull/254) ([mhashizume](https://github.com/mhashizume))
58
73
 
74
+ ## [2.1.0](https://github.com/puppetlabs/beaker-puppet/tree/2.1.0) (2024-03-19)
75
+
76
+ [Full Changelog](https://github.com/puppetlabs/beaker-puppet/compare/3.0.1...2.1.0)
77
+
59
78
  ## [3.0.1](https://github.com/puppetlabs/beaker-puppet/tree/3.0.1) (2024-03-12)
60
79
 
61
80
  [Full Changelog](https://github.com/puppetlabs/beaker-puppet/compare/3.0.0...3.0.1)
@@ -90,28 +109,9 @@ All notable changes to this project will be documented in this file.
90
109
 
91
110
  **Merged pull requests:**
92
111
 
93
- - Release prep [\#248](https://github.com/puppetlabs/beaker-puppet/pull/248) ([mhashizume](https://github.com/mhashizume))
94
- - Update excluded label to "maintenance" [\#247](https://github.com/puppetlabs/beaker-puppet/pull/247) ([mhashizume](https://github.com/mhashizume))
95
- - Add changelog generator configuration file [\#246](https://github.com/puppetlabs/beaker-puppet/pull/246) ([mhashizume](https://github.com/mhashizume))
96
- - Update release-prep script [\#245](https://github.com/puppetlabs/beaker-puppet/pull/245) ([mhashizume](https://github.com/mhashizume))
97
- - Update branch for github workflow testing [\#244](https://github.com/puppetlabs/beaker-puppet/pull/244) ([tvpartytonight](https://github.com/tvpartytonight))
98
- - Add release prep script [\#243](https://github.com/puppetlabs/beaker-puppet/pull/243) ([mhashizume](https://github.com/mhashizume))
99
- - Move to Puppet release GitHub Actions [\#242](https://github.com/puppetlabs/beaker-puppet/pull/242) ([mhashizume](https://github.com/mhashizume))
100
- - README: remove obsolete transfer notice, update badges [\#241](https://github.com/puppetlabs/beaker-puppet/pull/241) ([kenyon](https://github.com/kenyon))
101
- - Add Unicorn to CODEONWERS [\#235](https://github.com/puppetlabs/beaker-puppet/pull/235) ([cthorn42](https://github.com/cthorn42))
102
- - Update CODEOWNERS [\#234](https://github.com/puppetlabs/beaker-puppet/pull/234) ([cthorn42](https://github.com/cthorn42))
103
- - rubocop: Update to voxpupuli-rubocop 2.1.0 [\#230](https://github.com/puppetlabs/beaker-puppet/pull/230) ([bastelfreak](https://github.com/bastelfreak))
104
112
  - Bump actions/checkout from 3 to 4 [\#227](https://github.com/puppetlabs/beaker-puppet/pull/227) ([dependabot[bot]](https://github.com/apps/dependabot))
105
113
  - Update voxpupuli-rubocop requirement from ~\> 1.2 to ~\> 2.0 [\#226](https://github.com/puppetlabs/beaker-puppet/pull/226) ([dependabot[bot]](https://github.com/apps/dependabot))
106
114
 
107
- ## [2.1.0](https://github.com/puppetlabs/beaker-puppet/tree/2.1.0) (2024-03-19)
108
-
109
- [Full Changelog](https://github.com/puppetlabs/beaker-puppet/compare/2.0.0...2.1.0)
110
-
111
- **Implemented enhancements:**
112
-
113
- - \[PA-6181\]: Fix acceptance test failure caused due to addition of Amazon Linux 2023 in pe-client-tools for orchestrator client pipeline [\#250](https://github.com/puppetlabs/beaker-puppet/pull/250) ([span786](https://github.com/span786))
114
-
115
115
  ## [2.0.0](https://github.com/puppetlabs/beaker-puppet/tree/2.0.0) (2023-05-05)
116
116
 
117
117
  [Full Changelog](https://github.com/puppetlabs/beaker-puppet/compare/1.29.0...2.0.0)
@@ -133,14 +133,12 @@ All notable changes to this project will be documented in this file.
133
133
 
134
134
  **Merged pull requests:**
135
135
 
136
- - release 2.0.0 [\#224](https://github.com/puppetlabs/beaker-puppet/pull/224) ([bastelfreak](https://github.com/bastelfreak))
137
136
  - Update fakefs requirement from \>= 0.6, \< 2.0 to \>= 0.6, \< 3.0 [\#222](https://github.com/puppetlabs/beaker-puppet/pull/222) ([dependabot[bot]](https://github.com/apps/dependabot))
138
137
  - rubocop: fix layout cops [\#221](https://github.com/puppetlabs/beaker-puppet/pull/221) ([bastelfreak](https://github.com/bastelfreak))
139
138
  - rubocop: fix style violations [\#220](https://github.com/puppetlabs/beaker-puppet/pull/220) ([bastelfreak](https://github.com/bastelfreak))
140
139
  - CI: Build gems with strictness and verbosity & dependencies: Add version constraints [\#219](https://github.com/puppetlabs/beaker-puppet/pull/219) ([bastelfreak](https://github.com/bastelfreak))
141
140
  - CI: apply Vox Pupuli best practices [\#217](https://github.com/puppetlabs/beaker-puppet/pull/217) ([bastelfreak](https://github.com/bastelfreak))
142
141
  - Drop in-parallel dependency [\#214](https://github.com/puppetlabs/beaker-puppet/pull/214) ([ekohl](https://github.com/ekohl))
143
- - Update in-parallel requirement from ~\> 0.1 to \>= 0.1, \< 2.0 [\#213](https://github.com/puppetlabs/beaker-puppet/pull/213) ([dependabot[bot]](https://github.com/apps/dependabot))
144
142
  - Bump actions/checkout from 2 to 3 [\#211](https://github.com/puppetlabs/beaker-puppet/pull/211) ([dependabot[bot]](https://github.com/apps/dependabot))
145
143
  - tests: Always set the platform as a Beaker::Platform instance [\#209](https://github.com/puppetlabs/beaker-puppet/pull/209) ([ekohl](https://github.com/ekohl))
146
144
  - dependabot: check for github actions [\#208](https://github.com/puppetlabs/beaker-puppet/pull/208) ([bastelfreak](https://github.com/bastelfreak))
@@ -159,7 +157,6 @@ All notable changes to this project will be documented in this file.
159
157
 
160
158
  **Merged pull requests:**
161
159
 
162
- - Release 1.29.0 [\#203](https://github.com/puppetlabs/beaker-puppet/pull/203) ([yachub](https://github.com/yachub))
163
160
  - \(maint\) Uses RFC 5737 IP space in example [\#200](https://github.com/puppetlabs/beaker-puppet/pull/200) ([mhashizume](https://github.com/mhashizume))
164
161
 
165
162
  ## [1.28.0](https://github.com/puppetlabs/beaker-puppet/tree/1.28.0) (2022-09-08)
@@ -170,10 +167,6 @@ All notable changes to this project will be documented in this file.
170
167
 
171
168
  - \(PA-4552\) Create ci:test:setup step for iterative workflow [\#194](https://github.com/puppetlabs/beaker-puppet/pull/194) ([joshcooper](https://github.com/joshcooper))
172
169
 
173
- **Merged pull requests:**
174
-
175
- - Release 1.28.0 [\#201](https://github.com/puppetlabs/beaker-puppet/pull/201) ([joshcooper](https://github.com/joshcooper))
176
-
177
170
  ## [1.27.0](https://github.com/puppetlabs/beaker-puppet/tree/1.27.0) (2022-08-31)
178
171
 
179
172
  [Full Changelog](https://github.com/puppetlabs/beaker-puppet/compare/1.26.3...1.27.0)
@@ -208,7 +201,6 @@ All notable changes to this project will be documented in this file.
208
201
 
209
202
  **Merged pull requests:**
210
203
 
211
- - Release 1.26.2 [\#192](https://github.com/puppetlabs/beaker-puppet/pull/192) ([joshcooper](https://github.com/joshcooper))
212
204
  - \(PA-4178\) Only clear and add non-default gem sources [\#190](https://github.com/puppetlabs/beaker-puppet/pull/190) ([joshcooper](https://github.com/joshcooper))
213
205
 
214
206
  ## [1.26.1](https://github.com/puppetlabs/beaker-puppet/tree/1.26.1) (2022-03-24)
@@ -225,8 +217,6 @@ All notable changes to this project will be documented in this file.
225
217
 
226
218
  **Merged pull requests:**
227
219
 
228
- - Release 1.26.1 [\#189](https://github.com/puppetlabs/beaker-puppet/pull/189) ([mhashizume](https://github.com/mhashizume))
229
- - Release 1.26.0 [\#187](https://github.com/puppetlabs/beaker-puppet/pull/187) ([mhashizume](https://github.com/mhashizume))
230
220
  - \(PA-4332\) Changes download links to HTTPS [\#185](https://github.com/puppetlabs/beaker-puppet/pull/185) ([mhashizume](https://github.com/mhashizume))
231
221
 
232
222
  ## [1.26.0](https://github.com/puppetlabs/beaker-puppet/tree/1.26.0) (2022-03-23)
@@ -245,10 +235,6 @@ All notable changes to this project will be documented in this file.
245
235
 
246
236
  - \(PA-4331\) Fix the logic to only run on older solaris versions [\#183](https://github.com/puppetlabs/beaker-puppet/pull/183) ([cthorn42](https://github.com/cthorn42))
247
237
 
248
- **Merged pull requests:**
249
-
250
- - Release 1.25.0 [\#184](https://github.com/puppetlabs/beaker-puppet/pull/184) ([bastelfreak](https://github.com/bastelfreak))
251
-
252
238
  ## [1.24.0](https://github.com/puppetlabs/beaker-puppet/tree/1.24.0) (2022-03-04)
253
239
 
254
240
  [Full Changelog](https://github.com/puppetlabs/beaker-puppet/compare/1.23.0...1.24.0)
@@ -259,11 +245,9 @@ All notable changes to this project will be documented in this file.
259
245
 
260
246
  **Merged pull requests:**
261
247
 
262
- - Release 1.24.0 [\#181](https://github.com/puppetlabs/beaker-puppet/pull/181) ([bastelfreak](https://github.com/bastelfreak))
263
248
  - gemspec: fix typo in Apache-2.0 license [\#180](https://github.com/puppetlabs/beaker-puppet/pull/180) ([bastelfreak](https://github.com/bastelfreak))
264
249
  - Add Ruby 3.1 to CI [\#179](https://github.com/puppetlabs/beaker-puppet/pull/179) ([bastelfreak](https://github.com/bastelfreak))
265
250
  - Depend on Ruby 2.4 or newer in gemspec [\#178](https://github.com/puppetlabs/beaker-puppet/pull/178) ([bastelfreak](https://github.com/bastelfreak))
266
- - Release 1.23.0 [\#175](https://github.com/puppetlabs/beaker-puppet/pull/175) ([cthorn42](https://github.com/cthorn42))
267
251
 
268
252
  ## [1.23.0](https://github.com/puppetlabs/beaker-puppet/tree/1.23.0) (2022-02-23)
269
253
 
@@ -284,7 +268,6 @@ All notable changes to this project will be documented in this file.
284
268
 
285
269
  **Merged pull requests:**
286
270
 
287
- - Release 1.22.2 [\#171](https://github.com/puppetlabs/beaker-puppet/pull/171) ([bastelfreak](https://github.com/bastelfreak))
288
271
  - Fix install\_puppet\_on on el8 [\#170](https://github.com/puppetlabs/beaker-puppet/pull/170) ([gcampbell12](https://github.com/gcampbell12))
289
272
 
290
273
  ## [1.22.1](https://github.com/puppetlabs/beaker-puppet/tree/1.22.1) (2021-08-19)
@@ -293,7 +276,6 @@ All notable changes to this project will be documented in this file.
293
276
 
294
277
  **Merged pull requests:**
295
278
 
296
- - Prep for 1.22.1 release [\#169](https://github.com/puppetlabs/beaker-puppet/pull/169) ([tvpartytonight](https://github.com/tvpartytonight))
297
279
  - Revert "Use the built-in Resolv::IPv4::Regex" [\#168](https://github.com/puppetlabs/beaker-puppet/pull/168) ([kenyon](https://github.com/kenyon))
298
280
 
299
281
  ## [1.22.0](https://github.com/puppetlabs/beaker-puppet/tree/1.22.0) (2021-08-17)
@@ -307,10 +289,8 @@ All notable changes to this project will be documented in this file.
307
289
 
308
290
  **Merged pull requests:**
309
291
 
310
- - Regenerate v1.22 changelog [\#167](https://github.com/puppetlabs/beaker-puppet/pull/167) ([bastelfreak](https://github.com/bastelfreak))
311
292
  - Remove mentions of Beaker 3 [\#165](https://github.com/puppetlabs/beaker-puppet/pull/165) ([ekohl](https://github.com/ekohl))
312
293
  - Use the built-in Resolv::IPv4::Regex [\#164](https://github.com/puppetlabs/beaker-puppet/pull/164) ([ekohl](https://github.com/ekohl))
313
- - release 1.22.0 [\#163](https://github.com/puppetlabs/beaker-puppet/pull/163) ([bastelfreak](https://github.com/bastelfreak))
314
294
  - Implement codecov; update README.md [\#162](https://github.com/puppetlabs/beaker-puppet/pull/162) ([bastelfreak](https://github.com/bastelfreak))
315
295
  - Add both GPG keys when installing repos on SLES [\#157](https://github.com/puppetlabs/beaker-puppet/pull/157) ([GabrielNagy](https://github.com/GabrielNagy))
316
296
 
@@ -322,16 +302,10 @@ All notable changes to this project will be documented in this file.
322
302
 
323
303
  - Fix Arch Linux support [\#154](https://github.com/puppetlabs/beaker-puppet/pull/154) ([bastelfreak](https://github.com/bastelfreak))
324
304
 
325
- **Closed issues:**
326
-
327
- - Useless 'PATH' string prepended to PATH environment variable [\#151](https://github.com/puppetlabs/beaker-puppet/issues/151)
328
-
329
305
  **Merged pull requests:**
330
306
 
331
307
  - \(\#151\) Remove useless 'PATH' string from system PATH [\#152](https://github.com/puppetlabs/beaker-puppet/pull/152) ([silug](https://github.com/silug))
332
- - Release 1.21.0 with proper changelog [\#150](https://github.com/puppetlabs/beaker-puppet/pull/150) ([bastelfreak](https://github.com/bastelfreak))
333
308
  - \(maint\) replace use of deprecated method `get_puppet_collection` [\#149](https://github.com/puppetlabs/beaker-puppet/pull/149) ([ciprianbadescu](https://github.com/ciprianbadescu))
334
- - Convert workflow to Github Actions [\#148](https://github.com/puppetlabs/beaker-puppet/pull/148) ([ekohl](https://github.com/ekohl))
335
309
  - \(maint\) Make latest the latest stable instead of nightly [\#147](https://github.com/puppetlabs/beaker-puppet/pull/147) ([GabrielNagy](https://github.com/GabrielNagy))
336
310
  - \(maint\) Remove deprecated gem install flags [\#146](https://github.com/puppetlabs/beaker-puppet/pull/146) ([gimmyxd](https://github.com/gimmyxd))
337
311
  - \(maint\) redhat-8-arm64 builds access check [\#145](https://github.com/puppetlabs/beaker-puppet/pull/145) ([ciprianbadescu](https://github.com/ciprianbadescu))
@@ -512,8 +486,8 @@ All notable changes to this project will be documented in this file.
512
486
 
513
487
  - \(maint\) Bump version of puppet-agent to test against to 6.0.0 [\#109](https://github.com/puppetlabs/beaker-puppet/pull/109) ([melissa](https://github.com/melissa))
514
488
  - \(maint\) Remove assumption that we have runtime on docker [\#108](https://github.com/puppetlabs/beaker-puppet/pull/108) ([melissa](https://github.com/melissa))
515
- - \(maint\) Added debian 10 or higher to allow insecure repo [\#107](https://github.com/puppetlabs/beaker-puppet/pull/107) ([loopinu](https://github.com/loopinu))
516
- - \(MAINT\) Fix test:acceptance:pkg [\#106](https://github.com/puppetlabs/beaker-puppet/pull/106) ([smcelmurry](https://github.com/smcelmurry))
489
+ - \(maint\) Added debian 10 or higher to allow insecure repo [\#107](https://github.com/puppetlabs/beaker-puppet/pull/107) ([alexandru-d-popa](https://github.com/alexandru-d-popa))
490
+ - \(MAINT\) Fix test:acceptance:pkg [\#106](https://github.com/puppetlabs/beaker-puppet/pull/106) ([junebug-spencer](https://github.com/junebug-spencer))
517
491
  - \(maint\) Exclude tmp directory on module installation [\#101](https://github.com/puppetlabs/beaker-puppet/pull/101) ([glennsarti](https://github.com/glennsarti))
518
492
  - \(maint\) Enable acceptance testing with puppet-agent installed from ni… [\#98](https://github.com/puppetlabs/beaker-puppet/pull/98) ([melissa](https://github.com/melissa))
519
493
 
@@ -660,10 +634,6 @@ All notable changes to this project will be documented in this file.
660
634
 
661
635
  [Full Changelog](https://github.com/puppetlabs/beaker-puppet/compare/1.2.0...1.3.0)
662
636
 
663
- **Merged pull requests:**
664
-
665
- - pass hiera\_config argument to puppet\_apply [\#63](https://github.com/puppetlabs/beaker-puppet/pull/63) ([lmayorga1980](https://github.com/lmayorga1980))
666
-
667
637
  ## [1.2.0](https://github.com/puppetlabs/beaker-puppet/tree/1.2.0) (2018-09-11)
668
638
 
669
639
  [Full Changelog](https://github.com/puppetlabs/beaker-puppet/compare/1.1.0...1.2.0)
@@ -859,7 +829,7 @@ All notable changes to this project will be documented in this file.
859
829
 
860
830
  **Merged pull requests:**
861
831
 
862
- - \(maint\) Add beaker-abs to Gemfile [\#21](https://github.com/puppetlabs/beaker-puppet/pull/21) ([smcelmurry](https://github.com/smcelmurry))
832
+ - \(maint\) Add beaker-abs to Gemfile [\#21](https://github.com/puppetlabs/beaker-puppet/pull/21) ([junebug-spencer](https://github.com/junebug-spencer))
863
833
 
864
834
  ## [0.8.0](https://github.com/puppetlabs/beaker-puppet/tree/0.8.0) (2017-10-13)
865
835
 
@@ -662,11 +662,40 @@ module Beaker
662
662
  endpoint = 'status/v1/services/puppetdb-status'
663
663
  expected_regex = '\"state\" \{0,\}: \{0,\}\"running\"'
664
664
  end
665
- retry_on(host,
666
- "curl -m 1 http://localhost:#{nonssl_port}/#{endpoint} | grep '#{expected_regex}'",
667
- { max_retries: 120 })
668
- curl_with_retries('start puppetdb (ssl)',
669
- host, "https://#{host.node_name}:#{ssl_port}", [35, 60])
665
+ # The ssl status port is always enabled and is the check this method
666
+ # ultimately reports the result of, so use it as the primary
667
+ # liveness gate. Checking the nonssl port FIRST (as this method used
668
+ # to) meant every host with it disabled -- the default for fresh
669
+ # installs as of PE-45384/PE-44906 (SECVULN-1792) -- burned through
670
+ # 120 failed retries (~2 minutes, at retry_on's default 1s
671
+ # retry_interval) before ever reaching the check that actually
672
+ # matters (PE-45697).
673
+ result = curl_with_retries('start puppetdb (ssl)',
674
+ host, "https://#{host.node_name}:#{ssl_port}", [35, 60])
675
+
676
+ # Now that ssl liveness is already confirmed, the nonssl check is
677
+ # just a quick, best-effort secondary confirmation: a small retry
678
+ # budget is enough, and its absence -- by design, on a host with
679
+ # the cleartext listener disabled -- shouldn't fail this method.
680
+ nonssl_status_command = "curl -m 1 http://localhost:#{nonssl_port}/#{endpoint} | grep '#{expected_regex}'"
681
+ begin
682
+ retry_on(host, nonssl_status_command, { max_retries: 5 })
683
+ rescue RuntimeError => e
684
+ # Only treat this as the known "exhausted all retries" failure
685
+ # retry_on itself raises for THIS command (a plain RuntimeError
686
+ # with this exact templated message, see beaker's
687
+ # Beaker::DSL::Helpers::HostHelpers#retry_on) -- not any other
688
+ # RuntimeError, or a same-shaped error for a different command,
689
+ # that might surface from deeper in the retry loop (e.g. an
690
+ # SSH/connection error from the underlying on() call). Re-raise
691
+ # anything else unrecognized rather than silently reclassifying
692
+ # it below (PE-45697).
693
+ raise unless e.message == "Command `#{nonssl_status_command}` failed."
694
+
695
+ logger.warn("sleep_until_puppetdb_started: nonssl status check on port #{nonssl_port} did not succeed (#{e.message}), but ssl status check already confirmed puppetdb is running")
696
+ end
697
+
698
+ result
670
699
  end
671
700
 
672
701
  # Waits until a successful curl check has happened against puppetserver
@@ -29,7 +29,7 @@ module Beaker
29
29
  GitURI = %r{^(git|https?|file)://|^git@|^gitmirror@}
30
30
 
31
31
  # Github's ssh signature for cloning via ssh
32
- GitHubSig = 'github.com,207.97.227.239 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ=='
32
+ GitHubSig = 'github.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk=' # rubocop:disable Layout/LineLength
33
33
 
34
34
  # Merge given options with our default options in a consistent way
35
35
  # This will remove any nil values so that we always have a set default.
@@ -1,3 +1,3 @@
1
1
  module BeakerPuppet
2
- VERSION = '4.4.0'
2
+ VERSION = '4.4.2'
3
3
  end
@@ -21,5 +21,13 @@ step 'Verify host times' do
21
21
  end
22
22
 
23
23
  step 'Configure gem mirror' do
24
- configure_gem_mirror(hosts)
24
+ # Skip if RELEASE_STREAM is 'puppet9' and platform is aix or solaris
25
+ # Issue with Rubygems's SafeMarshal see: PA-8312
26
+ release_stream = ENV.fetch('RELEASE_STREAM')
27
+ skip_platforms = /aix|solaris/i
28
+ if release_stream == 'puppet9' && hosts.any? { |host| host['platform'] =~ skip_platforms }
29
+ logger.info 'Skipping configure_gem_mirror for puppet9 on aix/solaris, issue with rubygems 4.0'
30
+ else
31
+ configure_gem_mirror(hosts)
32
+ end
25
33
  end
@@ -1034,35 +1034,80 @@ describe ClassMixedWithDSLHelpers do
1034
1034
  allow(subject).to receive(:version_is_less).and_return(true)
1035
1035
  end
1036
1036
 
1037
- it 'uses the default ports if none given' do
1037
+ it 'uses the default ports if none given, checking ssl before nonssl' do
1038
1038
  host = hosts[0]
1039
- expect(subject).to receive(:retry_on).with(anything, /8080/, anything).once.ordered
1040
1039
  expect(subject).to receive(:curl_with_retries).with(anything, anything, /8081/, anything).once.ordered
1040
+ expect(subject).to receive(:retry_on).with(anything, /8080/, anything).once.ordered
1041
1041
  subject.sleep_until_puppetdb_started(host)
1042
1042
  end
1043
1043
 
1044
1044
  it 'allows setting the nonssl_port' do
1045
1045
  host = hosts[0]
1046
- expect(subject).to receive(:retry_on).with(anything, /8084/, anything).once.ordered
1047
1046
  expect(subject).to receive(:curl_with_retries).with(anything, anything, /8081/, anything).once.ordered
1047
+ expect(subject).to receive(:retry_on).with(anything, /8084/, anything).once.ordered
1048
1048
 
1049
1049
  subject.sleep_until_puppetdb_started(host, 8084)
1050
1050
  end
1051
1051
 
1052
1052
  it 'allows setting the ssl_port' do
1053
1053
  host = hosts[0]
1054
- expect(subject).to receive(:retry_on).with(anything, /8080/, anything).once.ordered
1055
1054
  expect(subject).to receive(:curl_with_retries).with(anything, anything, /8085/, anything).once.ordered
1055
+ expect(subject).to receive(:retry_on).with(anything, /8080/, anything).once.ordered
1056
1056
 
1057
1057
  subject.sleep_until_puppetdb_started(host, nil, 8085)
1058
1058
  end
1059
1059
 
1060
+ context 'when the cleartext status port never responds (e.g. disabled by default)' do
1061
+ it 'swallows the failure once ssl liveness is already confirmed' do
1062
+ host = hosts[0]
1063
+ expect(subject).to receive(:curl_with_retries).with(anything, anything, /8081/, anything).once.ordered
1064
+ expect(subject).to receive(:retry_on).with(anything, anything, { max_retries: 5 }).once.ordered do |_host, command, _opts|
1065
+ raise "Command `#{command}` failed."
1066
+ end
1067
+
1068
+ expect { subject.sleep_until_puppetdb_started(host) }.not_to raise_error
1069
+ end
1070
+ end
1071
+
1072
+ context 'when the ssl check itself fails' do
1073
+ it 'raises without ever attempting the nonssl check' do
1074
+ host = hosts[0]
1075
+ expect(subject).to receive(:curl_with_retries).with(anything, anything, /8081/, anything).once
1076
+ .and_raise('Command `curl -m 1 https://.../` failed.')
1077
+ expect(subject).not_to receive(:retry_on)
1078
+
1079
+ expect { subject.sleep_until_puppetdb_started(host) }.to raise_error(/https/)
1080
+ end
1081
+ end
1082
+
1083
+ context 'when retry_on raises a RuntimeError unrelated to exhausted retries' do
1084
+ it 'propagates the error rather than treating it as a disabled port' do
1085
+ host = hosts[0]
1086
+ expect(subject).to receive(:curl_with_retries).with(anything, anything, /8081/, anything).once.ordered
1087
+ expect(subject).to receive(:retry_on).with(anything, /8080/, anything).once.ordered
1088
+ .and_raise('Host unreachable: no route to host')
1089
+
1090
+ expect { subject.sleep_until_puppetdb_started(host) }.to raise_error(/Host unreachable/)
1091
+ end
1092
+ end
1093
+
1094
+ context 'when retry_on raises a RuntimeError formatted like the templated failure but for a different command' do
1095
+ it 'propagates the error rather than treating it as a disabled port' do
1096
+ host = hosts[0]
1097
+ expect(subject).to receive(:curl_with_retries).with(anything, anything, /8081/, anything).once.ordered
1098
+ expect(subject).to receive(:retry_on).with(anything, /8080/, anything).once.ordered
1099
+ .and_raise('Command `some other command` failed.')
1100
+
1101
+ expect { subject.sleep_until_puppetdb_started(host) }.to raise_error(/some other command/)
1102
+ end
1103
+ end
1104
+
1060
1105
  context 'when pe_ver is less than 2016.1.0' do
1061
1106
  it 'uses the version endpoint' do
1062
1107
  host = hosts[0]
1063
1108
  host['pe_ver'] = '2015.3.3'
1064
- expect(subject).to receive(:retry_on).with(anything, %r{pdb/meta/v1/version}, anything).once.ordered
1065
1109
  expect(subject).to receive(:curl_with_retries).with(anything, anything, /8081/, anything).once.ordered
1110
+ expect(subject).to receive(:retry_on).with(anything, %r{pdb/meta/v1/version}, anything).once.ordered
1066
1111
 
1067
1112
  expect(subject).to receive(:version_is_less).with(host['pe_ver'], '2016.1.0').and_return(true)
1068
1113
  subject.sleep_until_puppetdb_started(host)
@@ -1073,9 +1118,9 @@ describe ClassMixedWithDSLHelpers do
1073
1118
  it 'uses the status endpoint' do
1074
1119
  host = hosts[0]
1075
1120
  host['pe_ver'] = '2016.1.0'
1121
+ expect(subject).to receive(:curl_with_retries).with(anything, anything, /8081/, anything).once.ordered
1076
1122
  expect(subject).to receive(:retry_on).with(anything, %r{status/v1/services/puppetdb-status},
1077
1123
  anything).once.ordered
1078
- expect(subject).to receive(:curl_with_retries).with(anything, anything, /8081/, anything).once.ordered
1079
1124
 
1080
1125
  expect(subject).to receive(:version_is_less).with(host['pe_ver'], '2016.1.0').and_return(false)
1081
1126
  subject.sleep_until_puppetdb_started(host)
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: 4.4.0
4
+ version: 4.4.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: 2026-02-24 00:00:00.000000000 Z
11
+ date: 2026-08-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: fakefs