beaker-pe 0.12.2 → 1.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/Gemfile +2 -2
- data/HISTORY.md +663 -3
- data/README.md +17 -1
- data/beaker-pe.gemspec +1 -0
- data/lib/beaker-pe.rb +8 -10
- data/lib/beaker-pe/install/pe_utils.rb +5 -1
- data/lib/beaker-pe/version.rb +1 -1
- data/spec/beaker-pe/install/pe_utils_spec.rb +6 -1
- data/spec/beaker_test_helpers.rb +17 -0
- data/spec/spec_helper.rb +1 -0
- metadata +17 -2
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
ODliMGVjYWViODZhMDY2Y2U2NDJhYjI2MjhkOTAxNDg1NjkwYWE0Yw==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
Nzg0NzNmZjE1OTMwMzM5MDI4YWFjMmJmNWE0ODNlMjE4OTJlYWU5MQ==
|
7
7
|
SHA512:
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
MmEyNGM3NGZhNmFjYjViNTkyZGVjMGZkZDY2YzljMjA4OTY0ZTI3NTY4Y2Ix
|
10
|
+
YjI3MzU0YzE4MGViZmRjOThjYmJmMWY2NTM5MmZjYjI0NTQ5MTU0MDkxM2Fm
|
11
|
+
MDg3YWU1OGZkMmEzNzUxNTA4MWQxNGMyNGYwYzQyZmU1OGM0NTQ=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
M2Y2NDE4MzRjNjU0MGEwOWFlNzVmN2YzZWIxMjFmZDI5YzhlNGE5OWMwMTg4
|
14
|
+
ODQ2YWNmZDBiNTE5MjM0ZGNlODBkYWEyMDZiZWM2ZDNmOWJlYWIwOTg4YWFi
|
15
|
+
M2NkOWRjZjliZjMxNmNhMTE3ZjJjMmFhYjNmZjNjOTZlN2E4NWQ=
|
data/Gemfile
CHANGED
@@ -18,11 +18,11 @@ end
|
|
18
18
|
# We don't put beaker in as a test dependency because we
|
19
19
|
# don't want to create a transitive dependency
|
20
20
|
group :acceptance_testing do
|
21
|
-
gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~>
|
21
|
+
gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 3.0')
|
22
22
|
end
|
23
23
|
|
24
24
|
if ENV['GEM_SOURCE'] =~ /rubygems\.delivery\.puppetlabs\.net/
|
25
|
-
gem "scooter", *location_for(ENV['SCOOTER_VERSION'] || '~>
|
25
|
+
gem "scooter", *location_for(ENV['SCOOTER_VERSION'] || '~> 3.0')
|
26
26
|
end
|
27
27
|
|
28
28
|
|
data/HISTORY.md
CHANGED
@@ -1,8 +1,668 @@
|
|
1
|
-
#
|
1
|
+
# default - History
|
2
2
|
## Tags
|
3
|
-
* [LATEST -
|
3
|
+
* [LATEST - 26 Sep, 2016 (0f384656)](#LATEST)
|
4
|
+
* [0.12.0 - 16 Sep, 2016 (81e5a0b0)](#0.12.0)
|
5
|
+
* [0.11.0 - 25 Aug, 2016 (7167f39e)](#0.11.0)
|
6
|
+
* [0.10.1 - 24 Aug, 2016 (97adf276)](#0.10.1)
|
7
|
+
* [0.10.0 - 23 Aug, 2016 (b8eff18f)](#0.10.0)
|
8
|
+
* [0.9.0 - 15 Aug, 2016 (e29ed491)](#0.9.0)
|
9
|
+
* [0.8.0 - 2 Aug, 2016 (b40f583b)](#0.8.0)
|
10
|
+
* [0.7.0 - 19 Jul, 2016 (8256c0ac)](#0.7.0)
|
11
|
+
* [0.6.0 - 11 Jul, 2016 (e974e7f8)](#0.6.0)
|
12
|
+
* [0.5.0 - 15 Jun, 2016 (8f2874fe)](#0.5.0)
|
13
|
+
* [0.4.0 - 1 Jun, 2016 (f5ad1884)](#0.4.0)
|
14
|
+
* [0.3.0 - 26 May, 2016 (0d6b6d4c)](#0.3.0)
|
15
|
+
* [0.2.0 - 18 May, 2016 (a65f2083)](#0.2.0)
|
16
|
+
* [0.1.2 - 4 Apr, 2016 (a6fd7bef)](#0.1.2)
|
17
|
+
* [0.1.1 - 4 Apr, 2016 (8203d928)](#0.1.1)
|
18
|
+
* [0.1.0 - 29 Feb, 2016 (4fc88d8c)](#0.1.0)
|
4
19
|
|
5
20
|
## Details
|
6
|
-
### <a name = "LATEST">LATEST -
|
21
|
+
### <a name = "LATEST">LATEST - 26 Sep, 2016 (0f384656)
|
22
|
+
|
23
|
+
* (GEM) update beaker-pe version to 1.0.0 (0f384656)
|
24
|
+
|
25
|
+
* Merge pull request #27 from kevpl/bkr941_beaker-pe_1.0 (55d48b15)
|
26
|
+
|
27
|
+
|
28
|
+
```
|
29
|
+
Merge pull request #27 from kevpl/bkr941_beaker-pe_1.0
|
30
|
+
|
31
|
+
(BKR-941) beaker-pe 1.0 changes
|
32
|
+
```
|
33
|
+
* (BKR-941) update scooter dependency (c124fef9)
|
34
|
+
|
35
|
+
* (BKR-941) update beaker dependency (faea2843)
|
36
|
+
|
37
|
+
|
38
|
+
```
|
39
|
+
(BKR-941) update beaker dependency
|
40
|
+
|
41
|
+
Since beaker-pe 1.0 will be using the new inclusion mechanism
|
42
|
+
of including itself in beaker's DSL, it shouldn't allow itself
|
43
|
+
to be used with beaker < 3.0.
|
44
|
+
```
|
45
|
+
* (BKR-941) beaker-pe 1.0 changes (2a05be9f)
|
46
|
+
|
47
|
+
|
48
|
+
```
|
49
|
+
(BKR-941) beaker-pe 1.0 changes
|
50
|
+
|
51
|
+
These are the changes required to update beaker-pe to
|
52
|
+
its first major version. These changes are done to use
|
53
|
+
the beaker 3.0 DSL library inclusion mechanism, pulling
|
54
|
+
the current beaker-pe requirement out of beaker itself
|
55
|
+
```
|
56
|
+
### <a name = "0.12.0">0.12.0 - 16 Sep, 2016 (81e5a0b0)
|
57
|
+
|
58
|
+
* (HISTORY) update beaker-pe history for gem release 0.12.0 (81e5a0b0)
|
59
|
+
|
60
|
+
* (GEM) update beaker-pe version to 0.12.0 (d16e0bc1)
|
61
|
+
|
62
|
+
* Merge pull request #26 from zreichert/maint/master/QA-2620_fix_installation_noop_for_nix (e75cdb09)
|
63
|
+
|
64
|
+
|
65
|
+
```
|
66
|
+
Merge pull request #26 from zreichert/maint/master/QA-2620_fix_installation_noop_for_nix
|
67
|
+
|
68
|
+
(QA-2620) update install_pe_client_tools_on to use package repo
|
69
|
+
```
|
70
|
+
* (QA-2620) update install_pe_client_tools_on to use package repo (665da12b)
|
71
|
+
|
72
|
+
### <a name = "0.11.0">0.11.0 - 25 Aug, 2016 (7167f39e)
|
73
|
+
|
74
|
+
* (HISTORY) update beaker-pe history for gem release 0.11.0 (7167f39e)
|
75
|
+
|
76
|
+
* (GEM) update beaker-pe version to 0.11.0 (ca260aa0)
|
77
|
+
|
78
|
+
* Merge pull request #23 from zreichert/maint/master/QA-2620_fix_package_installation (176c59ee)
|
79
|
+
|
80
|
+
|
81
|
+
```
|
82
|
+
Merge pull request #23 from zreichert/maint/master/QA-2620_fix_package_installation
|
83
|
+
|
84
|
+
(QA-2620) update package install for pe-client-tools to use package …
|
85
|
+
```
|
86
|
+
* (QA-2620) update package install for pe-client-tools to use package name not file name (120aae3b)
|
87
|
+
|
88
|
+
### <a name = "0.10.1">0.10.1 - 24 Aug, 2016 (97adf276)
|
89
|
+
|
90
|
+
* (HISTORY) update beaker-pe history for gem release 0.10.1 (97adf276)
|
91
|
+
|
92
|
+
* (GEM) update beaker-pe version to 0.10.1 (a826414c)
|
93
|
+
|
94
|
+
* Merge pull request #24 from kevpl/bkr922_bkr908_fix (baff3281)
|
95
|
+
|
96
|
+
|
97
|
+
```
|
98
|
+
Merge pull request #24 from kevpl/bkr922_bkr908_fix
|
99
|
+
|
100
|
+
(BKR-922) fixed options reference for beaker-rspec
|
101
|
+
```
|
102
|
+
* (BKR-922) fixed options reference for beaker-rspec (bd232256)
|
103
|
+
|
104
|
+
|
105
|
+
```
|
106
|
+
(BKR-922) fixed options reference for beaker-rspec
|
107
|
+
|
108
|
+
In BKR-908, code was added to make console timeout checking
|
109
|
+
configurable. This code relied on `@options` to get the
|
110
|
+
value from the global option. This works in beaker but not
|
111
|
+
in beaker-rspec, because `@options` is a TestCase instance
|
112
|
+
variable. The accessor `options` works in both, because it
|
113
|
+
is a TestCase accessor in beaker, and a similar method has
|
114
|
+
been added in beaker-rspec's [shim](https://github.com/puppetlabs/beaker-rspec/blob/master/lib/beaker-rspec/beaker_shim.rb#L26-L28).
|
115
|
+
```
|
116
|
+
### <a name = "0.10.0">0.10.0 - 23 Aug, 2016 (b8eff18f)
|
117
|
+
|
118
|
+
* (HISTORY) update beaker-pe history for gem release 0.10.0 (b8eff18f)
|
119
|
+
|
120
|
+
* (GEM) update beaker-pe version to 0.10.0 (1c8df4c3)
|
121
|
+
|
122
|
+
* (BKR-908) added attempts config to console status check (#22) (d5e711de)
|
123
|
+
|
124
|
+
|
125
|
+
```
|
126
|
+
(BKR-908) added attempts config to console status check (#22)
|
127
|
+
|
128
|
+
* (BKR-908) added attempts config to console status check
|
129
|
+
|
130
|
+
* (BKR-908) handle JSON::ParserError case
|
131
|
+
```
|
132
|
+
### <a name = "0.9.0">0.9.0 - 15 Aug, 2016 (e29ed491)
|
133
|
+
|
134
|
+
* (HISTORY) update beaker-pe history for gem release 0.9.0 (e29ed491)
|
135
|
+
|
136
|
+
* (GEM) update beaker-pe version to 0.9.0 (01d03513)
|
137
|
+
|
138
|
+
* (MAINT) fix incorrect orchestrator config file name (#20) (af220d39)
|
139
|
+
|
140
|
+
* (QA-2603) update MSI path for "install_pe_client_tools_on" (#21) (919dcf36)
|
141
|
+
|
142
|
+
### <a name = "0.8.0">0.8.0 - 2 Aug, 2016 (b40f583b)
|
143
|
+
|
144
|
+
* (HISTORY) update beaker-pe history for gem release 0.8.0 (b40f583b)
|
145
|
+
|
146
|
+
* (GEM) update beaker-pe version to 0.8.0 (f4d290f2)
|
147
|
+
|
148
|
+
* (QA-2514) PE-client-tools helpers (#15) (32d70efe)
|
149
|
+
|
150
|
+
|
151
|
+
```
|
152
|
+
(QA-2514) PE-client-tools helpers (#15)
|
153
|
+
|
154
|
+
* (QA-2514) PE-client-tools helpers
|
155
|
+
|
156
|
+
* (maint) Add install helpers for pe-client-tools
|
157
|
+
|
158
|
+
This commit adds three helper methods to install pe-client-tools on Windows.
|
159
|
+
|
160
|
+
The first is a general method that is designed to abstract
|
161
|
+
away the installation of pe-client-tools on supported operating systems.
|
162
|
+
Currently, it only accommodates development builds of the tools based on the
|
163
|
+
provided SHA and SUITE_VERSION environment variables available.
|
164
|
+
|
165
|
+
The second is a generic method to install an msi package on a target host.
|
166
|
+
Beaker's built in method of this name assumes that msi installed involves the
|
167
|
+
installation of puppet, so this method overrides that one without such an
|
168
|
+
assumption.
|
169
|
+
|
170
|
+
The this is a generic method to install a dmg package on a target host.
|
171
|
+
Beaker's built in `install_package` method for osx does not accommodate for an
|
172
|
+
installer `pkg` file that is named differently from the containing `dmg`. This
|
173
|
+
method forces the user to supply both names explicitly.
|
174
|
+
|
175
|
+
* (maint) Remove install helpers for pe-client-tools
|
176
|
+
|
177
|
+
This commit removes the dmg and msi helper methods instroduced earlier.
|
178
|
+
|
179
|
+
These two methods have bee moved into beaker.
|
180
|
+
|
181
|
+
* basic spec tests for ExecutableHelper & ConfigFileHelper
|
182
|
+
```
|
183
|
+
* Merge pull request #18 from demophoon/fix/master/pe-16886-pe-console-service-wait (949852c8)
|
184
|
+
|
185
|
+
|
186
|
+
```
|
187
|
+
Merge pull request #18 from demophoon/fix/master/pe-16886-pe-console-service-wait
|
188
|
+
|
189
|
+
(PE-16886) Add wait for console to be functional before continuing with puppet agent runs
|
190
|
+
```
|
191
|
+
* Merge pull request #17 from johnduarte/fix-install-pe_utils_spec (187a413a)
|
192
|
+
|
193
|
+
|
194
|
+
```
|
195
|
+
Merge pull request #17 from johnduarte/fix-install-pe_utils_spec
|
196
|
+
|
197
|
+
(MAINT) Fix install/pe_utils spec test
|
198
|
+
```
|
199
|
+
* (PE-16886) Add wait for console to be functional (eef0f254)
|
200
|
+
|
201
|
+
|
202
|
+
```
|
203
|
+
(PE-16886) Add wait for console to be functional
|
204
|
+
|
205
|
+
Before this commit the console may or may not be functional by the time
|
206
|
+
the next puppet agent run occurs on the following node. This can cause
|
207
|
+
puppetserver to return with an error from the classifier when it is
|
208
|
+
attempting to evaluate the classes which should be applied to the node.
|
209
|
+
|
210
|
+
This commit adds in a sleep and service check to the final agent run
|
211
|
+
step on the console node which will hopefully work around this issue
|
212
|
+
until it is fixed in SERVER-1237.
|
213
|
+
```
|
214
|
+
* (MAINT) Fix install/pe_utils spec test (5ca075ca)
|
215
|
+
|
216
|
+
|
217
|
+
```
|
218
|
+
(MAINT) Fix install/pe_utils spec test
|
219
|
+
|
220
|
+
Changes introduced at commit 33cdfef caused the install/pe_utils
|
221
|
+
spec test to fail. This commit updates the spec test to introduce
|
222
|
+
the `opts[:HOSTS]` data that the implementation code expects to have
|
223
|
+
available.
|
224
|
+
```
|
225
|
+
### <a name = "0.7.0">0.7.0 - 19 Jul, 2016 (8256c0ac)
|
226
|
+
|
227
|
+
* (HISTORY) update beaker-pe history for gem release 0.7.0 (8256c0ac)
|
228
|
+
|
229
|
+
* (GEM) update beaker-pe version to 0.7.0 (f31dbe09)
|
230
|
+
|
231
|
+
* Merge pull request #12 from highb/feature/pe-15351_non_interactive_flag_on_installer (5062ede4)
|
232
|
+
|
233
|
+
|
234
|
+
```
|
235
|
+
Merge pull request #12 from highb/feature/pe-15351_non_interactive_flag_on_installer
|
236
|
+
|
237
|
+
(PE-15351) Use -y option for 2016.2.1+ installs
|
238
|
+
```
|
239
|
+
* (PE-15351) Change -f option to -y (d86f4cde)
|
240
|
+
|
241
|
+
|
242
|
+
```
|
243
|
+
(PE-15351) Change -f option to -y
|
244
|
+
|
245
|
+
Prior to this commit I was using the `-f` option in the installer,
|
246
|
+
now it is `-y`. For more information, see
|
247
|
+
https://github.com/puppetlabs/pe-installer-shim/pull/31/commits/0dfd6eb488456a7177673bb720edf9758521f096
|
248
|
+
```
|
249
|
+
* (PE-15351) Fix use of -c/-f flags on upgrades (33cdfef0)
|
250
|
+
|
251
|
+
|
252
|
+
```
|
253
|
+
(PE-15351) Fix use of -c/-f flags on upgrades
|
254
|
+
|
255
|
+
Prior to this commit the condition used to decide whether to use
|
256
|
+
the `-c`/`-f` flags was dependent on `host['pe_upgrade_ver']` and
|
257
|
+
`host['pe_ver']` which was an unreliable condition.
|
258
|
+
This commit updates the condition to determine whether to use the
|
259
|
+
`-f` flag to simply look at `host['pe_ver']` because that value
|
260
|
+
is updated depending on what version of pe is currently being
|
261
|
+
installed or upgraded to.
|
262
|
+
The condition to decide to omit the `-c` flag has to depend on
|
263
|
+
`opts[:HOSTS][host.name][:pe_ver]` because that value is not
|
264
|
+
modified during upgrade and can be used for a valid comparison
|
265
|
+
to determine if the install will have a `pe.conf` file to use
|
266
|
+
for an upgrade.
|
267
|
+
```
|
268
|
+
* (PE-15351) Use -f option for 2016.2.1+ installs (9372dc29)
|
269
|
+
|
270
|
+
|
271
|
+
```
|
272
|
+
(PE-15351) Use -f option for 2016.2.1+ installs
|
273
|
+
|
274
|
+
Prior to this commit there was not an option for signalling a
|
275
|
+
non-interactive install to the installer.
|
276
|
+
This commit adds the new `-f` option added in
|
277
|
+
https://github.com/puppetlabs/pe-installer-shim/pull/31 to the
|
278
|
+
command line options for installation/upgrade.
|
279
|
+
|
280
|
+
Additionally, this commit will remove the `-c` parameter being
|
281
|
+
passed on upgrades from a 2016.2.0+ install, because the installer
|
282
|
+
should be able to pick up on the existing pe.conf file.
|
283
|
+
```
|
284
|
+
### <a name = "0.6.0">0.6.0 - 11 Jul, 2016 (e974e7f8)
|
285
|
+
|
286
|
+
* (HISTORY) update beaker-pe history for gem release 0.6.0 (e974e7f8)
|
287
|
+
|
288
|
+
* (GEM) update beaker-pe version to 0.6.0 (48b663eb)
|
289
|
+
|
290
|
+
* Merge pull request #14 from ericwilliamson/task/master/PE-16566-download-gpg-key (99c5008f)
|
291
|
+
|
292
|
+
|
293
|
+
```
|
294
|
+
Merge pull request #14 from ericwilliamson/task/master/PE-16566-download-gpg-key
|
295
|
+
|
296
|
+
(PE-16566) Add method to download life support gpg key
|
297
|
+
```
|
298
|
+
* (PE-16566) Add method to download life support gpg key (df1f14bf)
|
299
|
+
|
300
|
+
|
301
|
+
```
|
302
|
+
(PE-16566) Add method to download life support gpg key
|
303
|
+
|
304
|
+
As of July 8th, 2016 the GPG key that was shipped with and used to sign
|
305
|
+
repos inside of PE tarballs expired. A new life support key was created
|
306
|
+
that extended the expiration date to Jan 2017. That key shipped with PE
|
307
|
+
3.8.5 and 2016.1.2.
|
308
|
+
|
309
|
+
apt based platforms appear to be the only package manager failing due to
|
310
|
+
an expired key, while rpm is fine.
|
311
|
+
|
312
|
+
This commit adds a new helper method to additionally download and
|
313
|
+
install the extended key for PE versions that have already been released
|
314
|
+
and are needing to be tested.
|
315
|
+
```
|
316
|
+
### <a name = "0.5.0">0.5.0 - 15 Jun, 2016 (8f2874fe)
|
317
|
+
|
318
|
+
* (HISTORY) update beaker-pe history for gem release 0.5.0 (8f2874fe)
|
319
|
+
|
320
|
+
* (GEM) update beaker-pe version to 0.5.0 (985fe231)
|
321
|
+
|
322
|
+
* Merge pull request #11 from highb/cutover/pe-14555 (1b21288a)
|
323
|
+
|
324
|
+
|
325
|
+
```
|
326
|
+
Merge pull request #11 from highb/cutover/pe-14555
|
327
|
+
|
328
|
+
(PE-14555) Always use MEEP for >= 2016.2.0
|
329
|
+
```
|
330
|
+
* (PE-14555) Always use MEEP for >= 2016.2.0 (de3a5050)
|
331
|
+
|
332
|
+
|
333
|
+
```
|
334
|
+
(PE-14555) Always use MEEP for >= 2016.2.0
|
335
|
+
|
336
|
+
Prior to this commit pe-beaker would use `INSTALLER_TYPE` to
|
337
|
+
specify whether to run a MEEP (new) or legacy install.
|
338
|
+
This commit changes pe-beaker to always use MEEP if the PE
|
339
|
+
version being installed is >= 2016.2.0, and legacy otherwise.
|
340
|
+
|
341
|
+
No ENV parameters will be passed to specify which to use, as we
|
342
|
+
are now relying on the installer itself to default to using MEEP
|
343
|
+
by default in all 2016.2.0 builds going forward.
|
344
|
+
```
|
345
|
+
### <a name = "0.4.0">0.4.0 - 1 Jun, 2016 (f5ad1884)
|
346
|
+
|
347
|
+
* (HISTORY) update beaker-pe history for gem release 0.4.0 (f5ad1884)
|
348
|
+
|
349
|
+
* (GEM) update beaker-pe version to 0.4.0 (e04b1f64)
|
350
|
+
|
351
|
+
* Merge pull request #9 from jpartlow/issue/master/pe-14554-switch-default-to-meep (c9eff0ea)
|
352
|
+
|
353
|
+
|
354
|
+
```
|
355
|
+
Merge pull request #9 from jpartlow/issue/master/pe-14554-switch-default-to-meep
|
356
|
+
|
357
|
+
(PE-14554) Switch default to meep
|
358
|
+
```
|
359
|
+
* (PE-14554) Switch default to meep (f234e5fc)
|
360
|
+
|
361
|
+
|
362
|
+
```
|
363
|
+
(PE-14554) Switch default to meep
|
364
|
+
|
365
|
+
If INSTALLER_TYPE is not set, beaker-pe will now default to a meep
|
366
|
+
install. You must set INSTALLER_TYPE to 'legacy' to get a legacy
|
367
|
+
install out of Beaker with this patch.
|
368
|
+
```
|
369
|
+
### <a name = "0.3.0">0.3.0 - 26 May, 2016 (0d6b6d4c)
|
370
|
+
|
371
|
+
* (HISTORY) update beaker-pe history for gem release 0.3.0 (0d6b6d4c)
|
372
|
+
|
373
|
+
* (GEM) update beaker-pe version to 0.3.0 (d58ed99e)
|
374
|
+
|
375
|
+
* Merge pull request #5 from jpartlow/issue/master/pe-14271-wire-for-meep (55aa098f)
|
376
|
+
|
377
|
+
|
378
|
+
```
|
379
|
+
Merge pull request #5 from jpartlow/issue/master/pe-14271-wire-for-meep
|
380
|
+
|
381
|
+
(PE-14271) Wire beaker-pe for meep
|
382
|
+
```
|
383
|
+
* (maint) Add some logging context for sign and agent shutdown (398882f4)
|
384
|
+
|
385
|
+
|
386
|
+
```
|
387
|
+
(maint) Add some logging context for sign and agent shutdown
|
388
|
+
|
389
|
+
...steps.
|
390
|
+
```
|
391
|
+
* (PE-14271) Do not try to sign certificate for meep core hosts (e485c423)
|
392
|
+
|
393
|
+
|
394
|
+
```
|
395
|
+
(PE-14271) Do not try to sign certificate for meep core hosts
|
396
|
+
|
397
|
+
Certificate is generated by meep. Step is redundant and produces failed
|
398
|
+
puppet agent run and puppet cert sign in log.
|
399
|
+
```
|
400
|
+
* (PE-15259) Inform BeakerAnswers if we need legacy database defaults (7ef0347d)
|
401
|
+
|
402
|
+
|
403
|
+
```
|
404
|
+
(PE-15259) Inform BeakerAnswers if we need legacy database defaults
|
405
|
+
|
406
|
+
Based on this setting, BeakerAnswers can provide legacy bash default
|
407
|
+
values for database user parameters in the meep hiera config. This is
|
408
|
+
necessary if we are upgrading from an older pe that beaker just
|
409
|
+
installed using the legacy script/answer defaults.
|
410
|
+
|
411
|
+
Also logs the actual answers/pe.conf file that was generated so we can
|
412
|
+
see what is going on.
|
413
|
+
```
|
414
|
+
* (maint) Remove unused variables from spec (61134529)
|
415
|
+
|
416
|
+
|
417
|
+
```
|
418
|
+
(maint) Remove unused variables from spec
|
419
|
+
|
420
|
+
Marked by static analysis; specs continue to pass after removal.
|
421
|
+
```
|
422
|
+
* (PE-14271) Have mock hosts return a hostname (53e90212)
|
423
|
+
|
424
|
+
|
425
|
+
```
|
426
|
+
(PE-14271) Have mock hosts return a hostname
|
427
|
+
|
428
|
+
Because BeakerAnswers sets hiera host parameters from Host#hostname, so
|
429
|
+
the method needs to exist in our mocks.
|
430
|
+
```
|
431
|
+
* (maint) Make the previous_pe_ver available on upgrade (0f72aaab)
|
432
|
+
|
433
|
+
|
434
|
+
```
|
435
|
+
(maint) Make the previous_pe_ver available on upgrade
|
436
|
+
|
437
|
+
Sometimes during PE upgrades we need to be able to determine what
|
438
|
+
version we upgraded from, to know what behavior we expect from the
|
439
|
+
upgrade. Prior to this change, that could only be determined by probing
|
440
|
+
into the original host.cfg yaml. This patch just sets it explicitly in
|
441
|
+
each host prior to overwriting the pe_ver with pe_upgrade_ver.
|
442
|
+
```
|
443
|
+
* (PE-14271) Adjust higgs commands to provide correct answer (f7cc8d9a)
|
444
|
+
|
445
|
+
|
446
|
+
```
|
447
|
+
(PE-14271) Adjust higgs commands to provide correct answer
|
448
|
+
|
449
|
+
...for both legacy and meep installers. The former prompts to continue
|
450
|
+
expecting 'Y' and the later prompts with options where '1' is intended
|
451
|
+
to kick off Higgs.
|
452
|
+
|
453
|
+
Also added spec coverage for these methods.
|
454
|
+
```
|
455
|
+
* (PE-14271) Adjust BeakerAnswers call for meep (6bc392ff)
|
456
|
+
|
457
|
+
|
458
|
+
```
|
459
|
+
(PE-14271) Adjust BeakerAnswers call for meep
|
460
|
+
|
461
|
+
Based on changes pending in puppetlabs/beaker-answers#16, change the
|
462
|
+
generate_installer_conf_file_for() method to submit the expected :format
|
463
|
+
option temporarily. This will go away when we cutover to meep and no
|
464
|
+
longer have to have both installer scripts operational in the same
|
465
|
+
build.
|
466
|
+
|
467
|
+
Fleshes out the specs that verify the method returns expected answer or
|
468
|
+
pe.conf data from BeakerAnswers, as written out via scp.
|
469
|
+
```
|
470
|
+
* (PE-14271) Prepare host installer options based on version/env (616612a6)
|
471
|
+
|
472
|
+
|
473
|
+
```
|
474
|
+
(PE-14271) Prepare host installer options based on version/env
|
475
|
+
|
476
|
+
The addition of a use_meep? query allows setting host options for either
|
477
|
+
legacy or meep installer. This enables installer_cmd to invoke the
|
478
|
+
correct installer.
|
479
|
+
```
|
480
|
+
* (maint) Remove remaining version_is_less mocks (7ea8fbcf)
|
481
|
+
|
482
|
+
|
483
|
+
```
|
484
|
+
(maint) Remove remaining version_is_less mocks
|
485
|
+
|
486
|
+
For consistency, removed the rest of the version_is_less mocks.
|
487
|
+
|
488
|
+
In the three cases where this had an impact on the specs, replaced
|
489
|
+
them with a concrete version setting on the test host object.
|
490
|
+
```
|
491
|
+
* (maint) Stop mocking version_is_less in do_install tests (d3e09cc1)
|
492
|
+
|
493
|
+
|
494
|
+
```
|
495
|
+
(maint) Stop mocking version_is_less in do_install tests
|
496
|
+
|
497
|
+
Each change to do_install and supporting methods involving a
|
498
|
+
version_is_less call was requiring additional mocking simulating
|
499
|
+
version_is_less's behavior. This is unnecessary given that hosts are
|
500
|
+
being set with a version, and actually masks behavior of the class.
|
501
|
+
Removing these specifically because it was causing churn when
|
502
|
+
introducing meep functionality.
|
503
|
+
```
|
504
|
+
* (PE-14271) Extract installer configuration methods (3071c5e9)
|
505
|
+
|
506
|
+
|
507
|
+
```
|
508
|
+
(PE-14271) Extract installer configuration methods
|
509
|
+
|
510
|
+
...from the existing code to generate answers and expand it to
|
511
|
+
generalize the installer settings and configuration file. Passes
|
512
|
+
existing specs. Will be further specialized to handle legacy/meep
|
513
|
+
cases.
|
514
|
+
```
|
515
|
+
* (PE-14934) Fix specs to cover changes from PE-14934 (b22c3790)
|
516
|
+
|
517
|
+
|
518
|
+
```
|
519
|
+
(PE-14934) Fix specs to cover changes from PE-14934
|
520
|
+
|
521
|
+
Introduced chagnes to the do_install method, but specs were failing
|
522
|
+
because of the tight coupling between expectations and counts of command
|
523
|
+
execution.
|
524
|
+
|
525
|
+
The need to initialize metadata comes from the fact that the previous
|
526
|
+
PR #3 added step() calls, which reference the TestCase metadata attr.
|
527
|
+
Since we aren't using an actual TestCase instance, this had to be
|
528
|
+
initalized separately.
|
529
|
+
```
|
530
|
+
### <a name = "0.2.0">0.2.0 - 18 May, 2016 (a65f2083)
|
531
|
+
|
532
|
+
* (HISTORY) update beaker-pe history for gem release 0.2.0 (a65f2083)
|
533
|
+
|
534
|
+
* (GEM) update beaker-pe version to 0.2.0 (d9a052a4)
|
535
|
+
|
536
|
+
* Merge pull request #1 from Renelast/fix/windows_masterless (ef4be9a2)
|
537
|
+
|
538
|
+
|
539
|
+
```
|
540
|
+
Merge pull request #1 from Renelast/fix/windows_masterless
|
541
|
+
|
542
|
+
Fixes windows masterless installation
|
543
|
+
```
|
544
|
+
* Merge branch 'master' of https://github.com/puppetlabs/beaker-pe into fix/windows_masterless (f1a96fb2)
|
545
|
+
|
546
|
+
* Merge pull request #7 from tvpartytonight/BKR-656 (aa566657)
|
547
|
+
|
548
|
+
|
549
|
+
```
|
550
|
+
Merge pull request #7 from tvpartytonight/BKR-656
|
551
|
+
|
552
|
+
(maint) Remove leftover comments
|
553
|
+
```
|
554
|
+
* (maint) Remove leftover comments (c7ce982b)
|
555
|
+
|
556
|
+
|
557
|
+
```
|
558
|
+
(maint) Remove leftover comments
|
559
|
+
|
560
|
+
This removes some straggling comments and adds a comment to the new
|
561
|
+
metadata object in the `ClassMixedWithDSLInstallUtils` class.
|
562
|
+
```
|
563
|
+
* Merge pull request #6 from tvpartytonight/BKR-656 (c1ea366b)
|
564
|
+
|
565
|
+
|
566
|
+
```
|
567
|
+
Merge pull request #6 from tvpartytonight/BKR-656
|
568
|
+
|
569
|
+
BKR-656
|
570
|
+
```
|
571
|
+
* (BKR-656) refactor pe_ver setting into independent method (0d918c46)
|
572
|
+
|
573
|
+
|
574
|
+
```
|
575
|
+
(BKR-656) refactor pe_ver setting into independent method
|
576
|
+
|
577
|
+
Previous to this commit, transforming a host object prior to upgrading
|
578
|
+
was handled in the upgrade_pe_on method. This change removes that logic
|
579
|
+
from that method and allows for independent transformation to happen in
|
580
|
+
a new prep_host_for_upgrade method.
|
581
|
+
```
|
582
|
+
* (BKR-656) Update spec tests for do_install (b602661f)
|
583
|
+
|
584
|
+
|
585
|
+
```
|
586
|
+
(BKR-656) Update spec tests for do_install
|
587
|
+
|
588
|
+
Commit 7112971ac7b14b8c3e9703523bbb8526af6fdfbe introduced changes to
|
589
|
+
the do_install method but did not have any updates for the spec tests.
|
590
|
+
This commit adds those tests in.
|
591
|
+
```
|
592
|
+
* Adds type defaults and runs puppet agent on masterless windows (e7d06a3f)
|
593
|
+
|
594
|
+
* Fixes windows masterless installation (9ff54261)
|
595
|
+
|
596
|
+
|
597
|
+
```
|
598
|
+
Fixes windows masterless installation
|
599
|
+
|
600
|
+
Setting up a masterless windows client would fail with the following error:
|
601
|
+
|
602
|
+
Exited: 1
|
603
|
+
/usr/local/rvm/gems/ruby-2.2.1/gems/beaker-2.37.0/lib/beaker/host.rb:330:in `exec': Host 'sxrwjhkia9gzo03' exited with 1 running: (Beaker::Host::CommandFailure)
|
604
|
+
cmd.exe /c puppet config set server
|
605
|
+
Last 10 lines of output were:
|
606
|
+
Error: puppet config set takes 2 arguments, but you gave 1
|
607
|
+
Error: Try 'puppet help config set' for usage
|
608
|
+
|
609
|
+
As far as I could see this error is caused by the 'setup_defaults_and_config_helper_on' function which tries to set the master configuration setting in puppet.conf. But since there is no master varaible available this failes.
|
610
|
+
|
611
|
+
This patch should fix that by only calling setup_defaults_and_config_helper_on whern we're not doing a masterless installation.
|
612
|
+
```
|
613
|
+
### <a name = "0.1.2">0.1.2 - 4 Apr, 2016 (a6fd7bef)
|
614
|
+
|
615
|
+
* (HISTORY) update beaker-pe history for gem release 0.1.2 (a6fd7bef)
|
616
|
+
|
617
|
+
* (GEM) update beaker-pe version to 0.1.2 (b3175863)
|
618
|
+
|
619
|
+
* Merge pull request #3 from demophoon/fix/master/pe-14934-robust-puppetdb-check (c3bebe59)
|
620
|
+
|
621
|
+
|
622
|
+
```
|
623
|
+
Merge pull request #3 from demophoon/fix/master/pe-14934-robust-puppetdb-check
|
624
|
+
|
625
|
+
(PE-14934) Add more robust puppetdb check
|
626
|
+
```
|
627
|
+
* (PE-14934) Add more robust puppetdb check (7112971a)
|
628
|
+
|
629
|
+
|
630
|
+
```
|
631
|
+
(PE-14934) Add more robust puppetdb check
|
632
|
+
|
633
|
+
Before this commit we were still failing before the last puppet agent
|
634
|
+
run in do_install because we also run puppet agent in some cases before
|
635
|
+
the last run. This commit adds in the wait during that agent run as well
|
636
|
+
as a check on the status endpoint in puppetdb to be sure that it is
|
637
|
+
running in the case that the port is open but puppetdb is not ready for
|
638
|
+
requests.
|
639
|
+
```
|
640
|
+
### <a name = "0.1.1">0.1.1 - 4 Apr, 2016 (8203d928)
|
641
|
+
|
642
|
+
* (HISTORY) update beaker-pe history for gem release 0.1.1 (8203d928)
|
643
|
+
|
644
|
+
* (GEM) update beaker-pe version to 0.1.1 (6ccb5a59)
|
645
|
+
|
646
|
+
* Merge pull request #2 from demophoon/fix/master/pe-14934 (4e0b668e)
|
647
|
+
|
648
|
+
|
649
|
+
```
|
650
|
+
Merge pull request #2 from demophoon/fix/master/pe-14934
|
651
|
+
|
652
|
+
(PE-14934) Test if puppetdb is up when running puppet agent on pdb node
|
653
|
+
```
|
654
|
+
* (PE-14934) Test if puppetdb is up when running puppet agent on pdb node (882ca94f)
|
655
|
+
|
656
|
+
|
657
|
+
```
|
658
|
+
(PE-14934) Test if puppetdb is up when running puppet agent on pdb node
|
659
|
+
|
660
|
+
Before this commit we were running into an issue where puppetdb would
|
661
|
+
sometimes not be up and running after puppet agent restarted the
|
662
|
+
service. This commit waits for the puppetdb service to be up after
|
663
|
+
running puppet agent on the database node so that the next agent run
|
664
|
+
doesn't fail.
|
665
|
+
```
|
666
|
+
### <a name = "0.1.0">0.1.0 - 29 Feb, 2016 (4fc88d8c)
|
7
667
|
|
8
668
|
* Initial release.
|
data/README.md
CHANGED
@@ -11,6 +11,22 @@ The PE Beaker library contains all PE-specific
|
|
11
11
|
|
12
12
|
that help someone acceptance test PE easier with Beaker.
|
13
13
|
|
14
|
+
# Upgrading from 0.y to 1.y?
|
15
|
+
|
16
|
+
If you've used beaker-pe previously (during the 0.y versions), you'll
|
17
|
+
have to change the way that you include beaker-pe for 1.y versions &
|
18
|
+
beyond.
|
19
|
+
|
20
|
+
Before, you could just include beaker itself and you'd get beaker-pe
|
21
|
+
because beaker required beaker-pe. With beaker 3.0, this dependency has
|
22
|
+
been taken out of beaker. Now to use beaker-pe, you'll have to do two
|
23
|
+
things:
|
24
|
+
|
25
|
+
1. add a beaker-pe requirement as a sibling to your current beaker gem
|
26
|
+
requirement
|
27
|
+
2. put a `require 'beaker-pe'` statement in your tests/code that need
|
28
|
+
beaker-pe-specific functionality
|
29
|
+
|
14
30
|
# Spec Testing
|
15
31
|
|
16
32
|
Spec tests all live under the `spec` folder. These are the default rake task, &
|
@@ -34,4 +50,4 @@ You can run the acceptance testing suite by invoking the `test:acceptance` rake
|
|
34
50
|
task. It should be noted that this is a shortcut for the `test:acceptance:quick`
|
35
51
|
task, which is named as such because it uses no pre-suite. This uses a default
|
36
52
|
provided hosts file for acceptance under the `acceptance/config` directory. If
|
37
|
-
you'd like to provide your own hosts file, set the `CONFIG` environment variable.
|
53
|
+
you'd like to provide your own hosts file, set the `CONFIG` environment variable.
|
data/beaker-pe.gemspec
CHANGED
data/lib/beaker-pe.rb
CHANGED
@@ -19,13 +19,11 @@ module Beaker
|
|
19
19
|
end
|
20
20
|
|
21
21
|
|
22
|
-
#
|
23
|
-
#
|
24
|
-
|
25
|
-
#
|
26
|
-
#
|
27
|
-
#
|
28
|
-
#
|
29
|
-
|
30
|
-
# # come through otherwise
|
31
|
-
# include Beaker::DSL
|
22
|
+
# Boilerplate DSL inclusion mechanism:
|
23
|
+
# First we register our module with the Beaker DSL
|
24
|
+
Beaker::DSL.register( Beaker::DSL::PE )
|
25
|
+
# Then we have to re-include our amended DSL in the TestCase,
|
26
|
+
# because in general, the DSL is included in TestCase far
|
27
|
+
# before test files are executed, so our amendments wouldn't
|
28
|
+
# come through otherwise
|
29
|
+
include Beaker::DSL
|
@@ -501,6 +501,10 @@ module Beaker
|
|
501
501
|
end
|
502
502
|
end
|
503
503
|
|
504
|
+
install_hosts.each do |host|
|
505
|
+
wait_for_host_in_dashboard(host)
|
506
|
+
end
|
507
|
+
|
504
508
|
# only appropriate for pre-3.9 builds
|
505
509
|
if version_is_less(master[:pe_ver], '3.99')
|
506
510
|
if pre30master
|
@@ -550,7 +554,7 @@ module Beaker
|
|
550
554
|
host_ver = host['pe_ver'] || opts['pe_ver']
|
551
555
|
|
552
556
|
if version_is_less(host_ver, '3.8.5') || (!version_is_less(host_ver, '2015.2.0') && version_is_less(host_ver, '2016.1.2'))
|
553
|
-
on(host, 'curl http://apt.puppetlabs.com/
|
557
|
+
on(host, 'curl http://apt.puppetlabs.com/pubkey.gpg | apt-key add -')
|
554
558
|
end
|
555
559
|
end
|
556
560
|
end
|
data/lib/beaker-pe/version.rb
CHANGED
@@ -445,7 +445,7 @@ describe ClassMixedWithDSLInstallUtils do
|
|
445
445
|
end
|
446
446
|
|
447
447
|
describe 'add_extended_gpg_key_to_hosts' do
|
448
|
-
let(:on_cmd) { 'curl http://apt.puppetlabs.com/
|
448
|
+
let(:on_cmd) { 'curl http://apt.puppetlabs.com/pubkey.gpg | apt-key add -' }
|
449
449
|
let(:deb_host) do
|
450
450
|
host = hosts.first
|
451
451
|
host['platform'] = 'debian'
|
@@ -659,6 +659,7 @@ describe ClassMixedWithDSLInstallUtils do
|
|
659
659
|
allow( subject ).to receive( :stop_agent_on ).and_return( true )
|
660
660
|
allow( subject ).to receive( :sleep_until_puppetdb_started ).and_return( true )
|
661
661
|
allow( subject ).to receive( :max_version ).with(anything, '3.8').and_return('3.0')
|
662
|
+
allow( subject ).to receive( :wait_for_host_in_dashboard ).and_return( true )
|
662
663
|
allow( subject ).to receive( :puppet_agent ) do |arg|
|
663
664
|
"puppet agent #{arg}"
|
664
665
|
end
|
@@ -734,6 +735,7 @@ describe ClassMixedWithDSLInstallUtils do
|
|
734
735
|
expect( subject ).to_not receive( :sign_certificate_for )
|
735
736
|
expect( subject ).to receive( :stop_agent_on ).with( hosts[0] ).once
|
736
737
|
expect( subject ).to_not receive( :sleep_until_puppetdb_started )
|
738
|
+
expect( subject ).to_not receive( :wait_for_host_in_dashboard )
|
737
739
|
expect( subject ).to_not receive( :on ).with( hosts[0], /puppet agent -t/, :acceptable_exit_codes => [0,2] )
|
738
740
|
|
739
741
|
hosts.each do |host|
|
@@ -762,6 +764,7 @@ describe ClassMixedWithDSLInstallUtils do
|
|
762
764
|
allow( subject ).to receive( :stop_agent_on ).and_return( true )
|
763
765
|
allow( subject ).to receive( :sleep_until_puppetdb_started ).and_return( true )
|
764
766
|
allow( subject ).to receive( :max_version ).with(anything, '3.8').and_return('4.0')
|
767
|
+
allow( subject ).to receive( :wait_for_host_in_dashboard ).and_return( true )
|
765
768
|
allow( subject ).to receive( :puppet_agent ) do |arg|
|
766
769
|
"puppet agent #{arg}"
|
767
770
|
end
|
@@ -818,6 +821,7 @@ describe ClassMixedWithDSLInstallUtils do
|
|
818
821
|
allow( subject ).to receive( :stop_agent_on ).and_return( true )
|
819
822
|
allow( subject ).to receive( :sleep_until_puppetdb_started ).and_return( true )
|
820
823
|
allow( subject ).to receive( :max_version ).with(anything, '3.8').and_return('4.0')
|
824
|
+
allow( subject ).to receive( :wait_for_host_in_dashboard ).and_return( true )
|
821
825
|
allow( subject ).to receive( :puppet_agent ) do |arg|
|
822
826
|
"puppet agent #{arg}"
|
823
827
|
end
|
@@ -876,6 +880,7 @@ describe ClassMixedWithDSLInstallUtils do
|
|
876
880
|
allow( subject ).to receive( :stop_agent_on ).and_return( true )
|
877
881
|
allow( subject ).to receive( :sleep_until_puppetdb_started ).and_return( true )
|
878
882
|
allow( subject ).to receive( :max_version ).with(anything, '3.8').and_return('4.0')
|
883
|
+
allow( subject ).to receive( :wait_for_host_in_dashboard ).and_return( true )
|
879
884
|
allow( subject ).to receive( :puppet_agent ) do |arg|
|
880
885
|
"puppet agent #{arg}"
|
881
886
|
end
|
@@ -0,0 +1,17 @@
|
|
1
|
+
# These are specifically to mock Beaker methods necessary for testing
|
2
|
+
# that will be available during runtime because this is never run separate
|
3
|
+
# from Beaker itself.
|
4
|
+
#
|
5
|
+
# Including Beaker as a dependency would not work as a solution to this issue,
|
6
|
+
# since that would make a cycle in the dependency graph, at least until
|
7
|
+
# Beaker 3.0 happens and this is no longer a dependency of Beaker's.
|
8
|
+
module BeakerTestHelpers
|
9
|
+
include Beaker::DSL
|
10
|
+
end
|
11
|
+
|
12
|
+
module Beaker
|
13
|
+
module DSL
|
14
|
+
def self.register( helper )
|
15
|
+
end
|
16
|
+
end
|
17
|
+
end
|
data/spec/spec_helper.rb
CHANGED
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: 0.
|
4
|
+
version: 1.0.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: 2016-09-26 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rspec
|
@@ -150,6 +150,20 @@ dependencies:
|
|
150
150
|
- - ~>
|
151
151
|
- !ruby/object:Gem::Version
|
152
152
|
version: 0.0.0
|
153
|
+
- !ruby/object:Gem::Dependency
|
154
|
+
name: beaker-answers
|
155
|
+
requirement: !ruby/object:Gem::Requirement
|
156
|
+
requirements:
|
157
|
+
- - ~>
|
158
|
+
- !ruby/object:Gem::Version
|
159
|
+
version: '0.0'
|
160
|
+
type: :runtime
|
161
|
+
prerelease: false
|
162
|
+
version_requirements: !ruby/object:Gem::Requirement
|
163
|
+
requirements:
|
164
|
+
- - ~>
|
165
|
+
- !ruby/object:Gem::Version
|
166
|
+
version: '0.0'
|
153
167
|
description: Puppet Enterprise (PE) Install & Helper library
|
154
168
|
email:
|
155
169
|
- qe-team@puppetlabs.com
|
@@ -183,6 +197,7 @@ files:
|
|
183
197
|
- spec/beaker-pe/pe-client-tools/config_file_helper_spec.rb
|
184
198
|
- spec/beaker-pe/pe-client-tools/executable_helper_spec.rb
|
185
199
|
- spec/beaker-pe/pe-client-tools/installer_helper_spec.rb
|
200
|
+
- spec/beaker_test_helpers.rb
|
186
201
|
- spec/helpers.rb
|
187
202
|
- spec/spec_helper.rb
|
188
203
|
homepage: https://github.com/puppetlabs/beaker-pe
|