beaker 4.28.0 → 4.28.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.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +77 -70
  3. data/docs/how_to/ssh_connection_preference.md +4 -1
  4. data/lib/beaker/host/unix/exec.rb +12 -2
  5. data/lib/beaker/version.rb +1 -1
  6. data/spec/beaker/host/unix/exec_spec.rb +92 -34
  7. data/spec/beaker/options/subcommand_options_parser_spec.rb +8 -8
  8. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: '042089398937fe9ae306b0fa0e4f86f4ff4a1fb1c73bc986beb1a75f11d71d38'
4
- data.tar.gz: 6d17864b513e99ecb311534a582a058e7ebcab9f8d525df29f5ec722210870ed
3
+ metadata.gz: 2503ed24d90847be18c7fd19b77a560ccc36adfc62c0d05c572db54ae459ac9d
4
+ data.tar.gz: e1a48af6ec7c6a987e68fef2e2d8d66938ea6a0386261e055a3f44f152bf593d
5
5
  SHA512:
6
- metadata.gz: ccdb8c321acd3dda9a015916f0c576d77b42c9a546cafe08f8a8b37e8e0fac59e593530d6eb2d631527de28a4c685b8c715f1be13024cceee42f075fd4d867e5
7
- data.tar.gz: 01676fb8b0461b1dcfc363bbabf405e4af1e93449f025f6f3dd3b70103076862ccfc3e688e1b2fe1ebc03842f5734e5a6c802caca05028ddb0d3b43ca5e6ef87
6
+ metadata.gz: 70a874fb028a529662d75b41aed961799d24c9f1e2f4ecc787526f14fdb2171841decdbcc0949a703a5f6740a97265468e563420e532bf8ae57c6eb217d98e47
7
+ data.tar.gz: 2f59f3355f90fb02c0ced17550d7acb70075a6e604b4dfb53c616c312d630df3bcce87d5036eef45f44cc0ee5b2bf31974d4e53b37ba975735420bc6ca77ca97
data/CHANGELOG.md CHANGED
@@ -20,9 +20,16 @@ The headers used in [Keep a Changelog](http://keepachangelog.com) are:
20
20
  - Fixed - for any bug fixes.
21
21
  - Security - in case of vulnerabilities.
22
22
 
23
- # [Unreleased](https://github.com/puppetlabs/beaker/compare/4.28.0...master)
23
+ # [4.28.1](https://github.com/voxpupuli/beaker/compare/4.28.0...4.28.1) - 03-10-2021
24
24
 
25
- # [4.28.0](https://github.com/puppetlabs/beaker/compare/4.27.1...4.28.0) - 12-21-2020
25
+ ### Fixed
26
+
27
+ - Updated the ssh_preference example
28
+ - Fixed various spec tests
29
+ - Updated the `which` command to try `type -P` before falling back to `which`
30
+ for systems that may not have `which` installed
31
+
32
+ # [4.28.0](https://github.com/voxpupuli/beaker/compare/4.27.1...4.28.0) - 12-21-2020
26
33
 
27
34
  ### Changed
28
35
 
@@ -34,7 +41,7 @@ The headers used in [Keep a Changelog](http://keepachangelog.com) are:
34
41
 
35
42
  - Fix License text and SPDX code ([#1681](https://github.com/voxpupuli/beaker/pull/1678))
36
43
 
37
- # [4.27.1](https://github.com/puppetlabs/beaker/compare/4.27.0...4.27.1) - 09-29-2020
44
+ # [4.27.1](https://github.com/voxpupuli/beaker/compare/4.27.0...4.27.1) - 09-29-2020
38
45
 
39
46
  ### Changed
40
47
 
@@ -47,7 +54,7 @@ The headers used in [Keep a Changelog](http://keepachangelog.com) are:
47
54
  - Fixed time check logic during reboot
48
55
  - Wrap paths around "" on pswindows
49
56
 
50
- # [4.27.0](https://github.com/puppetlabs/beaker/compare/4.26.0...4.27.0) - 07-24-2020
57
+ # [4.27.0](https://github.com/voxpupuli/beaker/compare/4.26.0...4.27.0) - 07-24-2020
51
58
 
52
59
  ### Changed
53
60
 
@@ -57,7 +64,7 @@ The headers used in [Keep a Changelog](http://keepachangelog.com) are:
57
64
  repo to Vox Pupuli
58
65
 
59
66
 
60
- # [4.26.0](https://github.com/puppetlabs/beaker/compare/4.25.0...4.26.0)
67
+ # [4.26.0](https://github.com/voxpupuli/beaker/compare/4.25.0...4.26.0)
61
68
 
62
69
  ### Changed
63
70
 
@@ -67,41 +74,41 @@ The headers used in [Keep a Changelog](http://keepachangelog.com) are:
67
74
 
68
75
  - Removed deprecated use of `paranoid` flag with Net::SSH. #1655
69
76
 
70
- # [4.25.0](https://github.com/puppetlabs/beaker/compare/4.24.0...4.25.0)
77
+ # [4.25.0](https://github.com/voxpupuli/beaker/compare/4.24.0...4.25.0)
71
78
 
72
79
  ### Added
73
80
 
74
- - Execution of Beaker directly through ruby on localhost #1637 ([#1637](https://github.com/puppetlabs/beaker/pull/1637))
81
+ - Execution of Beaker directly through ruby on localhost #1637 ([#1637](https://github.com/voxpupuli/beaker/pull/1637))
75
82
 
76
83
  ### Fixed
77
84
 
78
- - Reliability improvements to the `Host#reboot` method ([#1656](https://github.com/puppetlabs/beaker/pull/1656)) ([#1659](https://github.com/puppetlabs/beaker/pull/1659))
85
+ - Reliability improvements to the `Host#reboot` method ([#1656](https://github.com/voxpupuli/beaker/pull/1656)) ([#1659](https://github.com/voxpupuli/beaker/pull/1659))
79
86
 
80
- # [4.24.0](https://github.com/puppetlabs/beaker/compare/4.23.0...4.24.0) - 2020-06-05
87
+ # [4.24.0](https://github.com/voxpupuli/beaker/compare/4.23.0...4.24.0) - 2020-06-05
81
88
 
82
89
  ### Added
83
90
 
84
- - Host method which ([#1651](https://github.com/puppetlabs/beaker/pull/1651))
91
+ - Host method which ([#1651](https://github.com/voxpupuli/beaker/pull/1651))
85
92
 
86
93
  ### Fixed
87
94
 
88
- - Fixed implementation for cat and file_exists? host methods for PSWindows ([#1654](https://github.com/puppetlabs/beaker/pull/1654))
89
- - Fixed implementation for mkdir_p host method for PSWindows ([#1657](https://github.com/puppetlabs/beaker/pull/1657))
95
+ - Fixed implementation for cat and file_exists? host methods for PSWindows ([#1654](https://github.com/voxpupuli/beaker/pull/1654))
96
+ - Fixed implementation for mkdir_p host method for PSWindows ([#1657](https://github.com/voxpupuli/beaker/pull/1657))
90
97
 
91
- # [4.23.2](https://github.com/puppetlabs/beaker/compare/4.23.1...4.23.2)
98
+ # [4.23.2](https://github.com/voxpupuli/beaker/compare/4.23.1...4.23.2)
92
99
 
93
100
  ### Fixed
94
101
 
95
102
  - Fixed Beaker's behavior when the `strict_host_key_checking` option is
96
103
  provided in the SSH config and Net-SSH > 5 is specified. (#1652)
97
104
 
98
- # [4.23.1](https://github.com/puppetlabs/beaker/compare/4.23.0...4.23.1)
105
+ # [4.23.1](https://github.com/voxpupuli/beaker/compare/4.23.0...4.23.1)
99
106
 
100
107
  ### Changed/Removed
101
108
 
102
109
  - Reversed the quoting changes on Unix from #1644 in favor of only quoting on Windows. (#1650)
103
110
 
104
- # [4.23.0](https://github.com/puppetlabs/beaker/compare/4.22.1...4.23.0)
111
+ # [4.23.0](https://github.com/voxpupuli/beaker/compare/4.22.1...4.23.0)
105
112
 
106
113
  ### Added
107
114
 
@@ -118,137 +125,137 @@ The headers used in [Keep a Changelog](http://keepachangelog.com) are:
118
125
  - Use Base64 UTF-16LE encoding for commands (#1626)
119
126
  - Fix `tmpdir` method for Powershell on Windows (#1645)
120
127
 
121
- # [4.22.1](https://github.com/puppetlabs/beaker/compare/4.22.0...4.22.1)
128
+ # [4.22.1](https://github.com/voxpupuli/beaker/compare/4.22.0...4.22.1)
122
129
 
123
130
  ### Fixed
124
131
 
125
- - Removed single quotes around paths for file operation commands on `Host` https://github.com/puppetlabs/beaker/pull/1642
132
+ - Removed single quotes around paths for file operation commands on `Host` https://github.com/voxpupuli/beaker/pull/1642
126
133
 
127
- # [4.22.0](https://github.com/puppetlabs/beaker/compare/4.21.0...4.22.0) - 2020-05-08
134
+ # [4.22.0](https://github.com/voxpupuli/beaker/compare/4.21.0...4.22.0) - 2020-05-08
128
135
 
129
136
  ### Added
130
137
 
131
- - Host methods chmod and modified_at. ([#1638](https://github.com/puppetlabs/beaker/pull/1638))
138
+ - Host methods chmod and modified_at. ([#1638](https://github.com/voxpupuli/beaker/pull/1638))
132
139
 
133
140
  ### Removed
134
141
 
135
- - Support for EL-5. ([#1639](https://github.com/puppetlabs/beaker/pull/1639)) ([#1640](https://github.com/puppetlabs/beaker/pull/1640))
142
+ - Support for EL-5. ([#1639](https://github.com/voxpupuli/beaker/pull/1639)) ([#1640](https://github.com/voxpupuli/beaker/pull/1640))
136
143
 
137
- # [4.21.0](https://github.com/puppetlabs/beaker/compare/4.20.0...4.21.0) - 2020-03-31
144
+ # [4.21.0](https://github.com/voxpupuli/beaker/compare/4.20.0...4.21.0) - 2020-03-31
138
145
 
139
146
  ### Added
140
147
 
141
- - Empty file `/etc/environment` while preparing ssh environment on Ubuntu 20.04 to keep the current behavior and consider all variables from `~/.ssh/environment`. ([#1635](https://github.com/puppetlabs/beaker/pull/1635))
148
+ - Empty file `/etc/environment` while preparing ssh environment on Ubuntu 20.04 to keep the current behavior and consider all variables from `~/.ssh/environment`. ([#1635](https://github.com/voxpupuli/beaker/pull/1635))
142
149
 
143
- # [4.20.0](https://github.com/puppetlabs/beaker/compare/4.19.0...4.20.0) - 2020-03-19
150
+ # [4.20.0](https://github.com/voxpupuli/beaker/compare/4.19.0...4.20.0) - 2020-03-19
144
151
 
145
152
  ### Added
146
153
 
147
- - Vagrant RSync/SSH settings will now be picked up if set via beaker-vagrant ([#1634](https://github.com/puppetlabs/beaker/pull/1634) and [beaker-vagrant#28](https://github.com/puppetlabs/beaker-vagrant/pull/28))
154
+ - Vagrant RSync/SSH settings will now be picked up if set via beaker-vagrant ([#1634](https://github.com/voxpupuli/beaker/pull/1634) and [beaker-vagrant#28](https://github.com/voxpupuli/beaker-vagrant/pull/28))
148
155
 
149
- # [4.19.0](https://github.com/puppetlabs/beaker/compare/4.18.0...4.19.0) - 2020-03-13
156
+ # [4.19.0](https://github.com/voxpupuli/beaker/compare/4.18.0...4.19.0) - 2020-03-13
150
157
 
151
158
  ### Added
152
159
 
153
- - `apt-transport-https` package will now be installed on Debian-based systems as part of the prebuilt process. ([#1631](https://github.com/puppetlabs/beaker/pull/1631))
154
- - Ubuntu 19.10 and 20.04 code name handling. ([#1632](https://github.com/puppetlabs/beaker/pull/1632))
160
+ - `apt-transport-https` package will now be installed on Debian-based systems as part of the prebuilt process. ([#1631](https://github.com/voxpupuli/beaker/pull/1631))
161
+ - Ubuntu 19.10 and 20.04 code name handling. ([#1632](https://github.com/voxpupuli/beaker/pull/1632))
155
162
 
156
163
  ### Changed
157
164
 
158
- - The `wait_time`, `max_connection_tries`, and `uptime_retries` parameters have been added to `Host::Unix::Exec.reboot`. This allows for more fine-grained control over how the reboot is handled. ([#1625](https://github.com/puppetlabs/beaker/pull/1625))
165
+ - The `wait_time`, `max_connection_tries`, and `uptime_retries` parameters have been added to `Host::Unix::Exec.reboot`. This allows for more fine-grained control over how the reboot is handled. ([#1625](https://github.com/voxpupuli/beaker/pull/1625))
159
166
 
160
167
  ### Fixed
161
168
 
162
- - In `hosts.yml`, `packaging_platform` will now default to `platform` if unspecified. This fixed a bug where beaker would fail unless you specified both values in your config, even if both values were identical. ([#1628](https://github.com/puppetlabs/beaker/pull/1628))
163
- - `version_is_less` will now correctly handle builds and RCs when used in version numbers. ([#1630](https://github.com/puppetlabs/beaker/pull/1630))
169
+ - In `hosts.yml`, `packaging_platform` will now default to `platform` if unspecified. This fixed a bug where beaker would fail unless you specified both values in your config, even if both values were identical. ([#1628](https://github.com/voxpupuli/beaker/pull/1628))
170
+ - `version_is_less` will now correctly handle builds and RCs when used in version numbers. ([#1630](https://github.com/voxpupuli/beaker/pull/1630))
164
171
 
165
172
  ### Security
166
173
  - Update `rake` to `~> 12.0`, which currently resolves to `12.3.3` to remediate [CVE-2020-8130](https://nvd.nist.gov/vuln/detail/CVE-2020-8130)
167
174
 
168
- # [4.18.0](https://github.com/puppetlabs/beaker/compare/4.17.0...4.18.0) - 2020-02-26
175
+ # [4.18.0](https://github.com/voxpupuli/beaker/compare/4.17.0...4.18.0) - 2020-02-26
169
176
  ### Changed
170
177
  - Thor dependency bumped to >=1.0.1 <2.0
171
178
 
172
- # [4.17.0](https://github.com/puppetlabs/beaker/compare/4.16.0...4.17.0) - 2020-02-20
179
+ # [4.17.0](https://github.com/voxpupuli/beaker/compare/4.16.0...4.17.0) - 2020-02-20
173
180
 
174
181
  ### Added
175
182
 
176
- - Windows support in `host_helpers` ([#1622](https://github.com/puppetlabs/beaker/pull/1622))
177
- - EL 8 support ([#1623](https://github.com/puppetlabs/beaker/pull/1623))
183
+ - Windows support in `host_helpers` ([#1622](https://github.com/voxpupuli/beaker/pull/1622))
184
+ - EL 8 support ([#1623](https://github.com/voxpupuli/beaker/pull/1623))
178
185
 
179
- # [4.16.0](https://github.com/puppetlabs/beaker/compare/4.15.0...4.16.0) - 2020-02-05
186
+ # [4.16.0](https://github.com/voxpupuli/beaker/compare/4.15.0...4.16.0) - 2020-02-05
180
187
 
181
188
  ### Added
182
189
 
183
- - release section to README ([#1618](https://github.com/puppetlabs/beaker/pull/1618))
184
- - false return if `link_exists?` raises an error ([#1613](https://github.com/puppetlabs/beaker/pull/1613))
190
+ - release section to README ([#1618](https://github.com/voxpupuli/beaker/pull/1618))
191
+ - false return if `link_exists?` raises an error ([#1613](https://github.com/voxpupuli/beaker/pull/1613))
185
192
 
186
193
  ### Fixed
187
194
 
188
- - `host.reboot` uses `uptime` rather than `ping` to check host status ([#1619](https://github.com/puppetlabs/beaker/pull/1619))
195
+ - `host.reboot` uses `uptime` rather than `ping` to check host status ([#1619](https://github.com/voxpupuli/beaker/pull/1619))
189
196
 
190
- # [4.15.0](https://github.com/puppetlabs/beaker/compare/4.14.1...4.15.0) - 2020-01-30
197
+ # [4.15.0](https://github.com/voxpupuli/beaker/compare/4.14.1...4.15.0) - 2020-01-30
191
198
 
192
199
  ### Added
193
200
 
194
201
  - macOS 10.15 Catalina support (BKR-1621)
195
202
 
196
- # [4.14.1](https://github.com/puppetlabs/beaker/compare/4.14.0...4.14.1) - 2019-11-18
203
+ # [4.14.1](https://github.com/voxpupuli/beaker/compare/4.14.0...4.14.1) - 2019-11-18
197
204
 
198
205
  ### Fixed
199
206
 
200
207
  - `fips_mode?` detection (#1607)
201
208
 
202
- # [4.14.0](https://github.com/puppetlabs/beaker/compare/4.13.1...4.14.0) - 2019-11-12
209
+ # [4.14.0](https://github.com/voxpupuli/beaker/compare/4.13.1...4.14.0) - 2019-11-12
203
210
 
204
211
  ### Added
205
212
 
206
213
  - Pre-built steps output stacktraces when aborted (QENG-7466)
207
214
 
208
- # [4.13.1](https://github.com/puppetlabs/beaker/compare/4.13.0...4.13.1) - 2019-10-07
215
+ # [4.13.1](https://github.com/voxpupuli/beaker/compare/4.13.0...4.13.1) - 2019-10-07
209
216
 
210
217
  ### Fixed
211
218
 
212
219
  - Use correct platform variant for FIPS repo configs download (BKR-1616)
213
220
 
214
- # [4.13.0](https://github.com/puppetlabs/beaker/compare/4.12.0...4.13.0) - 2019-09-16
221
+ # [4.13.0](https://github.com/voxpupuli/beaker/compare/4.12.0...4.13.0) - 2019-09-16
215
222
 
216
223
  ### Added
217
224
 
218
225
  - Host `enable_remote_rsyslog` method (QENG-7466)
219
226
 
220
- # [4.12.0](https://github.com/puppetlabs/beaker/compare/4.11.1...4.12.0) - 2019-08-14
227
+ # [4.12.0](https://github.com/voxpupuli/beaker/compare/4.11.1...4.12.0) - 2019-08-14
221
228
 
222
229
  ### Added
223
230
 
224
231
  - redhatfips as a recognized platform (PE-27037)
225
232
 
226
- # [4.11.1](https://github.com/puppetlabs/beaker/compare/4.11.0...4.11.1) - 2019-08-13
233
+ # [4.11.1](https://github.com/voxpupuli/beaker/compare/4.11.0...4.11.1) - 2019-08-13
227
234
 
228
235
  ### Changed
229
236
 
230
237
  - `host.down?`'s wait from a fibonacci to a constant wait (BKR-1595)
231
238
 
232
- # [4.11.0](https://github.com/puppetlabs/beaker/compare/4.10.0...4.11.0) - 2019-07-22
239
+ # [4.11.0](https://github.com/voxpupuli/beaker/compare/4.10.0...4.11.0) - 2019-07-22
233
240
 
234
241
  ### Added
235
242
 
236
243
  - FIPS detection host method (BKR-1604)
237
244
  - PassTest exception catching for standard reporting
238
245
 
239
- # [4.10.0](https://github.com/puppetlabs/beaker/compare/4.9.0...4.10.0) - 2019-07-01
246
+ # [4.10.0](https://github.com/voxpupuli/beaker/compare/4.9.0...4.10.0) - 2019-07-01
240
247
 
241
248
  ### Added
242
249
 
243
250
  - Down & Up Checking to Host#reboot (BKR-1595)
244
251
 
245
- # [4.9.0](https://github.com/puppetlabs/beaker/compare/4.8.0...4.9.0) - 2019-06-19
252
+ # [4.9.0](https://github.com/voxpupuli/beaker/compare/4.8.0...4.9.0) - 2019-06-19
246
253
 
247
254
  ### Changed
248
255
 
249
256
  - SSH Connection failure backoff shortened (BKR-1599)
250
257
 
251
- # [4.8.0](https://github.com/puppetlabs/beaker/compare/4.7.0...4.8.0) - 2019-04-17
258
+ # [4.8.0](https://github.com/voxpupuli/beaker/compare/4.7.0...4.8.0) - 2019-04-17
252
259
 
253
260
  ### Added
254
261
 
@@ -259,7 +266,7 @@ The headers used in [Keep a Changelog](http://keepachangelog.com) are:
259
266
 
260
267
  - Remove "repos-pe" prefix for repo filenames
261
268
 
262
- # [4.7.0](https://github.com/puppetlabs/beaker/compare/4.6.0...4.7.0) - 2019-04-17
269
+ # [4.7.0](https://github.com/voxpupuli/beaker/compare/4.6.0...4.7.0) - 2019-04-17
263
270
 
264
271
  ### Added
265
272
 
@@ -273,19 +280,19 @@ The headers used in [Keep a Changelog](http://keepachangelog.com) are:
273
280
  - Change behavior of ruby versioning to accept job-parameter RUBY\_VER
274
281
  - Change subcommand pre-suite to install ruby 2.3.1
275
282
 
276
- # [4.6.0](https://github.com/puppetlabs/beaker/compare/4.5.0...4.6.0) - 2019.03.07
283
+ # [4.6.0](https://github.com/voxpupuli/beaker/compare/4.5.0...4.6.0) - 2019.03.07
277
284
 
278
285
  ### Added
279
286
 
280
287
  - Codename for Debian 10 'Buster'
281
288
 
282
- # [4.5.0](https://github.com/puppetlabs/beaker/compare/4.4.0...4.5.0) - 2019.01.23
289
+ # [4.5.0](https://github.com/voxpupuli/beaker/compare/4.4.0...4.5.0) - 2019.01.23
283
290
 
284
291
  ### Changed
285
292
 
286
293
  - Do not mirror profile.d on Debian (BKR-1559)
287
294
 
288
- # [4.4.0](https://github.com/puppetlabs/beaker/compare/4.3.0...4.4.0) - 2019.01.09
295
+ # [4.4.0](https://github.com/voxpupuli/beaker/compare/4.3.0...4.4.0) - 2019.01.09
289
296
 
290
297
  ### Added
291
298
 
@@ -297,14 +304,14 @@ The headers used in [Keep a Changelog](http://keepachangelog.com) are:
297
304
 
298
305
  - Replace ntpdate with crony on RHEL-8 (BKR-1555)
299
306
 
300
- # [4.3.0](https://github.com/puppetlabs/beaker/compare/4.2.0...4.3.0) - 2018.12.12
307
+ # [4.3.0](https://github.com/voxpupuli/beaker/compare/4.2.0...4.3.0) - 2018.12.12
301
308
 
302
309
  ### Added
303
310
 
304
311
  - Use zypper to install RPM packages on SLES (PA-2336)
305
312
  - Add only-fails capability to beaker (BKR-1523)
306
313
 
307
- # [4.2.0](https://github.com/puppetlabs/beaker/compare/4.1.0...4.2.0) - 2018.11.28
314
+ # [4.2.0](https://github.com/voxpupuli/beaker/compare/4.1.0...4.2.0) - 2018.11.28
308
315
 
309
316
  ### Added
310
317
 
@@ -321,7 +328,7 @@ The headers used in [Keep a Changelog](http://keepachangelog.com) are:
321
328
  - Recursively remove unpersisted subcommand options (BKR-1549)
322
329
 
323
330
 
324
- # [4.1.0](https://github.com/puppetlabs/beaker/compare/4.0.0...4.1.0) - 2018.10.25
331
+ # [4.1.0](https://github.com/voxpupuli/beaker/compare/4.0.0...4.1.0) - 2018.10.25
325
332
 
326
333
  ### Added
327
334
 
@@ -332,7 +339,7 @@ The headers used in [Keep a Changelog](http://keepachangelog.com) are:
332
339
  - Added additional tests for EL-like systems and added 'redhat' support where necessary
333
340
  - Test if puppet module is installed in '/' and avoid stripping of path seperator
334
341
 
335
- # [4.0.0](https://github.com/puppetlabs/beaker/compare/3.37.0...4.0.0) - 2018-08-06
342
+ # [4.0.0](https://github.com/voxpupuli/beaker/compare/3.37.0...4.0.0) - 2018-08-06
336
343
 
337
344
  ### Fixed
338
345
 
@@ -358,7 +365,7 @@ The headers used in [Keep a Changelog](http://keepachangelog.com) are:
358
365
 
359
366
  - `PEDefaults` has been moved to `beaker-pe`
360
367
 
361
- # [3.37.0](https://github.com/puppetlabs/beaker/compare/3.36.0...3.37.0) - 2018-07-11
368
+ # [3.37.0](https://github.com/voxpupuli/beaker/compare/3.36.0...3.37.0) - 2018-07-11
362
369
 
363
370
  ### Fixed
364
371
 
@@ -373,7 +380,7 @@ The headers used in [Keep a Changelog](http://keepachangelog.com) are:
373
380
  - `beaker-pe` is no longer automagically included. See [the upgrade guide](/docs/how_to/upgrade_from_3_to_4.md}) for more info
374
381
  - `beaker-puppet` is no longer required as a dependency
375
382
 
376
- # [3.36.0](https://github.com/puppetlabs/beaker/compare/3.35.0...3.36.0) - 2018-06-18
383
+ # [3.36.0](https://github.com/voxpupuli/beaker/compare/3.35.0...3.36.0) - 2018-06-18
377
384
 
378
385
  ### Fixed
379
386
 
@@ -387,7 +394,7 @@ The headers used in [Keep a Changelog](http://keepachangelog.com) are:
387
394
  - Glossary for project jargon in [`docs/concepts/glossary.md`](docs/concepts/glossary.md)
388
395
  - Use AIX 6.1 packages everywhere for puppet6
389
396
 
390
- # [3.35.0](https://github.com/puppetlabs/beaker/compare/3.34.0...3.35.0) - 2018-05-16
397
+ # [3.35.0](https://github.com/voxpupuli/beaker/compare/3.34.0...3.35.0) - 2018-05-16
391
398
 
392
399
  ### Fixed
393
400
 
@@ -398,7 +405,7 @@ The headers used in [Keep a Changelog](http://keepachangelog.com) are:
398
405
 
399
406
  - Added optional ability to use ERB in nodeset YAML files
400
407
 
401
- # [3.34.0](https://github.com/puppetlabs/beaker/compare/3.33.0...3.34.0) - 2018-03-26
408
+ # [3.34.0](https://github.com/voxpupuli/beaker/compare/3.33.0...3.34.0) - 2018-03-26
402
409
 
403
410
  ### Fixed
404
411
 
@@ -408,13 +415,13 @@ The headers used in [Keep a Changelog](http://keepachangelog.com) are:
408
415
 
409
416
  - Codename for Ubuntu 18.04 'Bionic'
410
417
 
411
- # [3.33.0](https://github.com/puppetlabs/beaker/compare/3.32.0...3.33.0) - 2018-03-07
418
+ # [3.33.0](https://github.com/voxpupuli/beaker/compare/3.32.0...3.33.0) - 2018-03-07
412
419
 
413
420
  ### Changed
414
421
 
415
422
  - Use relative paths for beaker exec
416
423
 
417
- # [3.32.0](https://github.com/puppetlabs/beaker/compare/3.31.0...3.32.0) - 2018-02-22
424
+ # [3.32.0](https://github.com/voxpupuli/beaker/compare/3.31.0...3.32.0) - 2018-02-22
418
425
 
419
426
  ### Changed
420
427
 
@@ -426,7 +433,7 @@ The headers used in [Keep a Changelog](http://keepachangelog.com) are:
426
433
 
427
434
  - Added missing beaker options for subcommand passthorugh
428
435
 
429
- # [3.31.0](https://github.com/puppetlabs/beaker/compare/3.30.0...3.31.0) - 2018-01-22
436
+ # [3.31.0](https://github.com/voxpupuli/beaker/compare/3.30.0...3.31.0) - 2018-01-22
430
437
 
431
438
  ### Changed
432
439
 
@@ -436,7 +443,7 @@ The headers used in [Keep a Changelog](http://keepachangelog.com) are:
436
443
 
437
444
  - Add macOS 10.13 support
438
445
 
439
- # [3.30.0](https://github.com/puppetlabs/beaker/compare/3.29.0...3.30.0) - 2018-01-10
446
+ # [3.30.0](https://github.com/voxpupuli/beaker/compare/3.29.0...3.30.0) - 2018-01-10
440
447
 
441
448
  ### Changed
442
449
 
@@ -450,30 +457,30 @@ The headers used in [Keep a Changelog](http://keepachangelog.com) are:
450
457
 
451
458
  - Load project options from .beaker.yml
452
459
 
453
- # [3.29.0](https://github.com/puppetlabs/beaker/compare/3.28.0...3.29.0) - 2017-11-16
460
+ # [3.29.0](https://github.com/voxpupuli/beaker/compare/3.28.0...3.29.0) - 2017-11-16
454
461
 
455
462
  ### Added
456
463
 
457
464
  - Adding default to read fog credentials
458
465
 
459
- # [3.28.0](https://github.com/puppetlabs/beaker/compare/3.27.0...3.28.0) - 2017-11-01
466
+ # [3.28.0](https://github.com/voxpupuli/beaker/compare/3.27.0...3.28.0) - 2017-11-01
460
467
 
461
468
  ### Fixed
462
469
 
463
470
  - corruption of `opts[:ignore]` when using `rsync`
464
471
 
465
- # [3.27.0](https://github.com/puppetlabs/beaker/compare/3.26.0...3.27.0) - 2017-10-19
472
+ # [3.27.0](https://github.com/voxpupuli/beaker/compare/3.26.0...3.27.0) - 2017-10-19
466
473
 
467
474
  ### Added
468
475
 
469
476
  - support amazon as a platform
470
477
  - add codenames for MacOS 10.13 and Ubuntu Artful
471
478
 
472
- # [3.26.0](https://github.com/puppetlabs/beaker/compare/3.25.0...3.26.0) - 2017-10-05
479
+ # [3.26.0](https://github.com/voxpupuli/beaker/compare/3.25.0...3.26.0) - 2017-10-05
473
480
 
474
481
  ### Added
475
482
 
476
483
  - concept of `manual_test` and `manual_step`
477
484
 
478
- # [3.25.0](https://github.com/puppetlabs/beaker/compare/3.24.0...3.25.0) - 2017-09-26
485
+ # [3.25.0](https://github.com/voxpupuli/beaker/compare/3.24.0...3.25.0) - 2017-09-26
479
486
 
data/docs/how_to/ssh_connection_preference.md CHANGED
@@ -30,7 +30,10 @@ HOSTS:
30
30
  hypervisor: vmpooler
31
31
  platform: ubuntu-16.04-amd64
32
32
  template: ubuntu-1604-x86_64
33
- ssh_preference: [:vmhostname, :hostname, :ip]
33
+ ssh_preference:
34
+ - :vmhostname
35
+ - :hostname
36
+ - :ip
34
37
  roles:
35
38
  - agent
36
39
  - default
data/lib/beaker/host/unix/exec.rb CHANGED
@@ -456,9 +456,19 @@ module Unix::Exec
456
456
  #@example
457
457
  # host.which('ruby')
458
458
  def which(command)
459
- which_command = "which #{command}"
459
+ unless @which_command
460
+ if execute('type -P true', :accept_all_exit_codes => true).empty?
461
+ if execute('which true', :accept_all_exit_codes => true).empty?
462
+ raise ArgumentError, "Could not find suitable 'which' command"
463
+ else
464
+ @which_command = 'which'
465
+ end
466
+ else
467
+ @which_command = 'type -P'
468
+ end
469
+ end
460
470
 
461
- result = execute(which_command, :accept_all_exit_codes => true)
471
+ result = execute("#{@which_command} #{command}", :accept_all_exit_codes => true)
462
472
  return '' if result.empty?
463
473
 
464
474
  result
data/lib/beaker/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Beaker
2
2
  module Version
3
- STRING = '4.28.0'
3
+ STRING = '4.28.1'
4
4
  end
5
5
  end
data/spec/beaker/host/unix/exec_spec.rb CHANGED
@@ -169,52 +169,54 @@ module Beaker
169
169
  end
170
170
 
171
171
  describe '#reboot' do
172
+ year = Time.now.strftime('%Y')
173
+
172
174
  check_cmd_output = {
173
175
  :centos6 => {
174
176
  :who => {
175
- :initial => ' system boot 2020-05-13 03:51',
176
- :success => ' system boot 2020-05-13 03:52',
177
+ :initial => " system boot #{year}-05-13 03:51",
178
+ :success => " system boot #{year}-05-13 03:52",
177
179
  },
178
180
  :last => {
179
181
  :initial => <<~LAST_F,
180
- reboot system boot 2.6.32-754.29.1. Tue May 5 17:34:52 2020 - Tue May 5 17:52:48 2020 (00:17)
181
- reboot system boot 2.6.32-754.29.1. Mon May 4 18:45:43 2020 - Mon May 5 05:35:44 2020 (4+01:50)
182
+ reboot system boot 2.6.32-754.29.1. Tue May 5 17:34:52 #{year} - Tue May 5 17:52:48 #{year} (00:17)
183
+ reboot system boot 2.6.32-754.29.1. Mon May 4 18:45:43 #{year} - Mon May 5 05:35:44 #{year} (4+01:50)
182
184
  LAST_F
183
185
  :success => <<~LAST_F,
184
- reboot system boot 2.6.32-754.29.1. Tue May 5 17:52:48 2020 - Tue May 5 17:52:49 2020 (00:17)
185
- reboot system boot 2.6.32-754.29.1. Mon May 4 18:45:43 2020 - Mon May 5 05:35:44 2020 (4+01:50)
186
+ reboot system boot 2.6.32-754.29.1. Tue May 5 17:52:48 #{year} - Tue May 5 17:52:49 #{year} (00:17)
187
+ reboot system boot 2.6.32-754.29.1. Mon May 4 18:45:43 #{year} - Mon May 5 05:35:44 #{year} (4+01:50)
186
188
  LAST_F
187
189
  },
188
190
  },
189
191
  :centos7 => {
190
192
  :who => {
191
- :initial => ' system boot 2020-05-13 03:51',
192
- :success => ' system boot 2020-05-13 03:52',
193
+ :initial => " system boot #{year}-05-13 03:51",
194
+ :success => " system boot #{year}-05-13 03:52",
193
195
  },
194
196
  :last => {
195
197
  :initial => <<~LAST_F,
196
- reboot system boot 3.10.0-1127.el7. Tue May 5 17:34:52 2020 - Tue May 5 17:52:48 2020 (00:17)
197
- reboot system boot 3.10.0-1127.el7. Mon May 4 18:45:43 2020 - Mon May 5 05:35:44 2020 (4+01:50)
198
+ reboot system boot 3.10.0-1127.el7. Tue May 5 17:34:52 #{year} - Tue May 5 17:52:48 #{year} (00:17)
199
+ reboot system boot 3.10.0-1127.el7. Mon May 4 18:45:43 #{year} - Mon May 5 05:35:44 #{year} (4+01:50)
198
200
  LAST_F
199
201
  :success => <<~LAST_F,
200
- reboot system boot 3.10.0-1127.el7. Tue May 5 17:52:48 2020 - Tue May 5 17:52:49 2020 (00:17)
201
- reboot system boot 3.10.0-1127.el7. Mon May 4 18:45:43 2020 - Mon May 5 05:35:44 2020 (4+01:50)
202
+ reboot system boot 3.10.0-1127.el7. Tue May 5 17:52:48 #{year} - Tue May 5 17:52:49 #{year} (00:17)
203
+ reboot system boot 3.10.0-1127.el7. Mon May 4 18:45:43 #{year} - Mon May 5 05:35:44 #{year} (4+01:50)
202
204
  LAST_F
203
205
  },
204
206
  },
205
207
  :centos8 => {
206
208
  :who => {
207
- :initial => ' system boot 2020-05-13 03:51',
208
- :success => ' system boot 2020-05-13 03:52',
209
+ :initial => " system boot #{year}-05-13 03:51",
210
+ :success => " system boot #{year}-05-13 03:52",
209
211
  },
210
212
  :last => {
211
213
  :initial => <<~LAST_F,
212
- reboot system boot 4.18.0-147.8.1.e Tue May 5 17:34:52 2020 still running
213
- reboot system boot 4.18.0-147.8.1.e Mon May 4 17:41:27 2020 - Tue May 5 17:00:00 2020 (5+00:11)
214
+ reboot system boot 4.18.0-147.8.1.e Tue May 5 17:34:52 #{year} still running
215
+ reboot system boot 4.18.0-147.8.1.e Mon May 4 17:41:27 #{year} - Tue May 5 17:00:00 #{year} (5+00:11)
214
216
  LAST_F
215
217
  :success => <<~LAST_F,
216
- reboot system boot 4.18.0-147.8.1.e Tue May 5 17:34:53 2020 still running
217
- reboot system boot 4.18.0-147.8.1.e Mon May 4 17:41:27 2020 - Tue May 5 17:00:00 2020 (5+00:11)
218
+ reboot system boot 4.18.0-147.8.1.e Tue May 5 17:34:53 #{year} still running
219
+ reboot system boot 4.18.0-147.8.1.e Mon May 4 17:41:27 #{year} - Tue May 5 17:00:00 #{year} (5+00:11)
218
220
  LAST_F
219
221
  },
220
222
  },
@@ -258,8 +260,8 @@ module Beaker
258
260
  expect(instance).to receive(:sleep).with(sleep_time)
259
261
  # bypass shutdown command itself
260
262
  expect(instance).to receive( :exec ).with(:shutdown_command_stub, anything).and_return(response)
261
- # allow the second boot_time and the hash arguments in exec
262
263
  expect(instance).to receive( :exec ).with(:boot_time_command_stub, anything).and_return(boot_time_initial_response).once
264
+ # allow the second boot_time and the hash arguments in exec
263
265
  expect(instance).to receive( :exec ).with(:boot_time_command_stub, anything).and_return(boot_time_success_response).once
264
266
 
265
267
  expect(instance.reboot).to be(nil)
@@ -384,30 +386,86 @@ module Beaker
384
386
  end
385
387
 
386
388
  describe '#which' do
387
- before do
388
- allow(instance).to receive(:execute)
389
- .with(where_command, :accept_all_exit_codes => true).and_return(result)
389
+ context 'when type -P works' do
390
+ before do
391
+ expect(instance).to receive(:execute)
392
+ .with('type -P true', :accept_all_exit_codes => true).and_return('/bin/true').once
393
+
394
+ allow(instance).to receive(:execute)
395
+ .with(where_command, :accept_all_exit_codes => true).and_return(result)
396
+ end
397
+
398
+ context 'when only the environment variable PATH is used' do
399
+ let(:where_command) { "type -P ruby" }
400
+ let(:result) { "/usr/bin/ruby.exe" }
401
+
402
+ it 'returns the correct path' do
403
+ response = instance.which('ruby')
404
+
405
+ expect(response).to eq(result)
406
+ end
407
+ end
408
+
409
+ context 'when command is not found' do
410
+ let(:where_command) { "type -P unknown" }
411
+ let(:result) { '' }
412
+
413
+ it 'return empty string if command is not found' do
414
+ response = instance.which('unknown')
415
+
416
+ expect(response).to eq(result)
417
+ end
418
+ end
390
419
  end
391
420
 
392
- context 'when only the environment variable PATH is used' do
393
- let(:where_command) { "which ruby" }
394
- let(:result) { "/usr/bin/ruby.exe" }
421
+ context 'when which works' do
422
+ before do
423
+ expect(instance).to receive(:execute)
424
+ .with('type -P true', :accept_all_exit_codes => true).and_return('').once
395
425
 
396
- it 'returns the correct path' do
397
- response = instance.which('ruby')
426
+ expect(instance).to receive(:execute)
427
+ .with('which true', :accept_all_exit_codes => true).and_return('/bin/true').once
398
428
 
399
- expect(response).to eq(result)
429
+ allow(instance).to receive(:execute)
430
+ .with(where_command, :accept_all_exit_codes => true).and_return(result)
431
+ end
432
+
433
+ context 'when only the environment variable PATH is used' do
434
+ let(:where_command) { "which ruby" }
435
+ let(:result) { "/usr/bin/ruby.exe" }
436
+
437
+ it 'returns the correct path' do
438
+ response = instance.which('ruby')
439
+
440
+ expect(response).to eq(result)
441
+ end
442
+ end
443
+
444
+ context 'when command is not found' do
445
+ let(:where_command) { "which unknown" }
446
+ let(:result) { '' }
447
+
448
+ it 'return empty string if command is not found' do
449
+ response = instance.which('unknown')
450
+
451
+ expect(response).to eq(result)
452
+ end
400
453
  end
401
454
  end
402
455
 
403
- context 'when command is not found' do
404
- let(:where_command) { "which unknown" }
405
- let(:result) { '' }
456
+ context 'when neither works' do
457
+ before do
458
+ expect(instance).to receive(:execute)
459
+ .with('type -P true', :accept_all_exit_codes => true).and_return('').once
406
460
 
407
- it 'return empty string if command is not found' do
408
- response = instance.which('unknown')
461
+ expect(instance).to receive(:execute)
462
+ .with('which true', :accept_all_exit_codes => true).and_return('').once
463
+ end
409
464
 
410
- expect(response).to eq(result)
465
+ context 'when only the environment variable PATH is used' do
466
+ it 'fails correctly' do
467
+ expect{instance.which('ruby')}.to raise_error(/suitable/)
468
+ end
411
469
  end
412
470
  end
413
471
  end
data/spec/beaker/options/subcommand_options_parser_spec.rb CHANGED
@@ -4,8 +4,9 @@ module Beaker
4
4
  module Options
5
5
  describe '#parse_subcommand_options' do
6
6
  let(:home_options_file_path) {ENV['HOME']+'/.beaker/subcommand_options.yaml'}
7
- let( :parser ) {Beaker::Options::SubcommandOptionsParser.parse_subcommand_options(argv, options_file)}
8
- let( :file_parser ){Beaker::Options::SubcommandOptionsParser.parse_options_file({})}
7
+ let(:parser_mod) { Beaker::Options::SubcommandOptionsParser }
8
+ let( :parser ) {parser_mod.parse_subcommand_options(argv, options_file)}
9
+ let( :file_parser ){parser_mod.parse_options_file({})}
9
10
  let( :argv ) {[]}
10
11
  let( :options_file ) {""}
11
12
 
@@ -26,14 +27,14 @@ module Beaker
26
27
  let( :argv ) {['provision']}
27
28
  let(:options_file) {Beaker::Subcommands::SubcommandUtil::SUBCOMMAND_OPTIONS}
28
29
  it 'calls parse_options_file with subcommand options file when home_dir is false' do
29
- allow(parser).to receive(:execute_subcommand?).with('provision').and_return true
30
- allow(parser).to receive(:parse_options_file).with(Beaker::Subcommands::SubcommandUtil::SUBCOMMAND_OPTIONS)
30
+ allow(parser_mod).to receive(:execute_subcommand?).with('provision').and_return true
31
+ allow(parser_mod).to receive(:parse_options_file).with(Beaker::Subcommands::SubcommandUtil::SUBCOMMAND_OPTIONS)
31
32
  end
32
33
 
33
34
  let( :options_file ) {home_options_file_path}
34
35
  it 'calls parse_options_file with home directory options file when home_dir is true' do
35
- allow(parser).to receive(:execute_subcommand?).with('provision').and_return true
36
- allow(parser).to receive(:parse_options_file).with(home_options_file_path)
36
+ allow(parser_mod).to receive(:execute_subcommand?).with('provision').and_return true
37
+ allow(parser_mod).to receive(:parse_options_file).with(home_options_file_path)
37
38
  end
38
39
 
39
40
  it 'checks for file existence and loads the YAML file' do
@@ -49,8 +50,7 @@ module Beaker
49
50
  expect(parser).to be_kind_of(OptionsHash)
50
51
  expect(parser).to be_empty
51
52
  end
52
-
53
53
  end
54
54
  end
55
55
  end
56
- end
56
+ end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: beaker
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.28.0
4
+ version: 4.28.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Puppet
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-12-21 00:00:00.000000000 Z
11
+ date: 2021-03-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rspec