beaker 1.17.0 → 1.17.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/HISTORY.md +62 -9
- data/history.rb +6 -3
- data/lib/beaker/answers/version34.rb +0 -4
- data/lib/beaker/version.rb +1 -1
- data/spec/beaker/answers_spec.rb +0 -7
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
ODE0YzQ4ODExNWQ2NjRhZDcwZmI0MmZjNWE1YTkyMDlkOTQzNDUyYw==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
MzliNzczZTJjZGVlMjNlNjJhMjYyMTFkMGQ4YjlhMTIwNTFkMzBlNg==
|
7
7
|
SHA512:
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
MTdmODVkY2ZlYTI2YjRjNTJkNTlmNjEzYTk3NWYzYWI5NDhmMzNjYWE2N2E3
|
10
|
+
YmE1ODI4NDgxOWUzMWZkNzhlZDlhY2IyYTEzMGIxODA1Yzg1Mzg3ZTczYTcz
|
11
|
+
NTgyMzIzZGQ3YTRlZDI3ODhhNDYyOWIzMTYwNGE0MjM4YmRiOWU=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
MzE3ZGQxMjc4Yjk0YjYwMmJlNWI0ODcwNGE4YjBmNzkzMmEwMjk5MjJjZjRl
|
14
|
+
MjVmMDY0YjEzYjgzODM0YmM2MDgyZjEwMDZlMjJlMjQ1MjlmYThiMDUxZjc3
|
15
|
+
ODM2NzhlZWU0MzJhMDUyZWYzMmM5ODRhYzk1ZDVhZjQxMDExYjc=
|
data/HISTORY.md
CHANGED
@@ -1,6 +1,7 @@
|
|
1
1
|
# beaker - History
|
2
2
|
## Tags
|
3
|
-
* [LATEST -
|
3
|
+
* [LATEST - 12 Aug, 2014 (0cb4134e)](#LATEST)
|
4
|
+
* [beaker1.17.0 - 12 Aug, 2014 (fb482b56)](#beaker1.17.0)
|
4
5
|
* [beaker1.16.0 - 17 Jul, 2014 (c1267696)](#beaker1.16.0)
|
5
6
|
* [beaker1.15.0 - 8 Jul, 2014 (82bb4ef9)](#beaker1.15.0)
|
6
7
|
* [beaker1.14.1 - 3 Jul, 2014 (d2e750d5)](#beaker1.14.1)
|
@@ -52,7 +53,59 @@
|
|
52
53
|
* [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
|
53
54
|
|
54
55
|
## Details
|
55
|
-
### <a name = "LATEST">LATEST -
|
56
|
+
### <a name = "LATEST">LATEST - 12 Aug, 2014 (0cb4134e)
|
57
|
+
|
58
|
+
* (HISTORY) update HISTORY.md for 1.17.1 gem (0cb4134e)
|
59
|
+
|
60
|
+
* (GEM) create beaker 1.17.1 gem (07b67f32)
|
61
|
+
|
62
|
+
* Merge pull request #397 from anodelman/maint (3e86c6f8)
|
63
|
+
|
64
|
+
|
65
|
+
```
|
66
|
+
Merge pull request #397 from anodelman/maint
|
67
|
+
|
68
|
+
(MAINT) add ability to generate history for branch other than 'master'
|
69
|
+
```
|
70
|
+
* Merge pull request #398 from nicklewis/revert-jvm-master (d9c67d1e)
|
71
|
+
|
72
|
+
|
73
|
+
```
|
74
|
+
Merge pull request #398 from nicklewis/revert-jvm-master
|
75
|
+
|
76
|
+
Revert "(QENG-997) Add PE installer answer for jvm puppet."
|
77
|
+
```
|
78
|
+
* Revert "(QENG-997) Add PE installer answer for jvm puppet." (215e115f)
|
79
|
+
|
80
|
+
|
81
|
+
```
|
82
|
+
Revert "(QENG-997) Add PE installer answer for jvm puppet."
|
83
|
+
|
84
|
+
This reverts commit b06b6313de24da82a031b6b04dc95042812b4445.
|
85
|
+
|
86
|
+
The installer doesn't actually function with this answer set, so we
|
87
|
+
certainly shouldn't be making it the default.
|
88
|
+
```
|
89
|
+
* (MAINT) add ability to generate history for branch other than 'master' (76ad94d5)
|
90
|
+
|
91
|
+
|
92
|
+
```
|
93
|
+
(MAINT) add ability to generate history for branch other than 'master'
|
94
|
+
|
95
|
+
- want to be able to generate a new HISTORY.md file based upon a
|
96
|
+
provided branch name
|
97
|
+
```
|
98
|
+
### <a name = "beaker1.17.0">beaker1.17.0 - 12 Aug, 2014 (fb482b56)
|
99
|
+
|
100
|
+
* Merge pull request #396 from anodelman/make-gem (fb482b56)
|
101
|
+
|
102
|
+
|
103
|
+
```
|
104
|
+
Merge pull request #396 from anodelman/make-gem
|
105
|
+
|
106
|
+
(GEM) create beaker 1.17.0 gem
|
107
|
+
```
|
108
|
+
* (HISTORY) add history for 1.17.0 gem (c04acf4d)
|
56
109
|
|
57
110
|
* (GEM) create beaker 1.17.0 gem (b2528072)
|
58
111
|
|
@@ -553,11 +606,11 @@ restarted.
|
|
553
606
|
```
|
554
607
|
* (QENG-807) add --collect-perf-data option, rspec tests, and yard docs (8d1a891d)
|
555
608
|
|
556
|
-
* (QENG-188) Allow foss runs to use service scripts (
|
609
|
+
* (QENG-188) Allow foss runs to use service scripts, take 2 (577fce4d)
|
557
610
|
|
558
611
|
|
559
612
|
```
|
560
|
-
(QENG-188) Allow foss runs to use service scripts
|
613
|
+
(QENG-188) Allow foss runs to use service scripts, take 2
|
561
614
|
|
562
615
|
Prior to this commit, any run of beaker with a non-pe master that
|
563
616
|
attempted to stand up a master with a particular configuration in order
|
@@ -594,7 +647,8 @@ apache2 was used for passenger and that apach2ctl is available.
|
|
594
647
|
|
595
648
|
Any existing test suite which does not 'opt-in' to any of these service
|
596
649
|
host changes by specifying any of the above properties should not be
|
597
|
-
effected by this commit.
|
650
|
+
effected by this commit. The exception to this is that PE runs will use
|
651
|
+
graceful restarts automatically with this commit.
|
598
652
|
|
599
653
|
There is also a spec related change to the FakeHost helper, which
|
600
654
|
previously was a stub pretending to provide Beaker::Host like facilities
|
@@ -604,11 +658,11 @@ so forth were added, and the FakeHost has been updated to instead use
|
|
604
658
|
Beaker::Host.create to provide a host instance that is then extended
|
605
659
|
with the MockedExec module stubbing the exec facilities for testing.
|
606
660
|
```
|
607
|
-
* (QENG-188) Allow foss runs to use service scripts
|
661
|
+
* (QENG-188) Allow foss runs to use service scripts (44d18d5f)
|
608
662
|
|
609
663
|
|
610
664
|
```
|
611
|
-
(QENG-188) Allow foss runs to use service scripts
|
665
|
+
(QENG-188) Allow foss runs to use service scripts
|
612
666
|
|
613
667
|
Prior to this commit, any run of beaker with a non-pe master that
|
614
668
|
attempted to stand up a master with a particular configuration in order
|
@@ -645,8 +699,7 @@ apache2 was used for passenger and that apach2ctl is available.
|
|
645
699
|
|
646
700
|
Any existing test suite which does not 'opt-in' to any of these service
|
647
701
|
host changes by specifying any of the above properties should not be
|
648
|
-
effected by this commit.
|
649
|
-
graceful restarts automatically with this commit.
|
702
|
+
effected by this commit.
|
650
703
|
|
651
704
|
There is also a spec related change to the FakeHost helper, which
|
652
705
|
previously was a stub pretending to provide Beaker::Host like facilities
|
data/history.rb
CHANGED
@@ -1,4 +1,6 @@
|
|
1
|
-
# Generates a HISTORY.md file for your repo based on tags and commits
|
1
|
+
# Generates a HISTORY.md file for your repo based on tags and commits, defaults to history for
|
2
|
+
# master branch but can generate history for specified branch
|
3
|
+
#
|
2
4
|
# Requires: gem install gitlab-grit
|
3
5
|
# Usage: ruby history.rb /your/repo/directory
|
4
6
|
#
|
@@ -7,16 +9,17 @@
|
|
7
9
|
require 'grit'
|
8
10
|
|
9
11
|
if ARGV.size < 1
|
10
|
-
p "Usage: ruby history.rb /your/repo/directory"
|
12
|
+
p "Usage: ruby history.rb /your/repo/directory branch(defaults to master)"
|
11
13
|
exit
|
12
14
|
end
|
13
15
|
|
14
16
|
output_file = 'HISTORY.md'
|
15
17
|
repo_dir = ARGV[0]
|
18
|
+
branch = ARGV[1] || 'master'
|
16
19
|
output = "# #{File.basename(File.absolute_path(repo_dir))} - History\n"
|
17
20
|
|
18
21
|
repo = Grit::Repo.new(repo_dir)
|
19
|
-
head = Grit::Tag.new(repo.commits.first.sha, repo, repo.commits.first.id)
|
22
|
+
head = Grit::Tag.new(repo.commits(branch).first.sha, repo, repo.commits(branch).first.id)
|
20
23
|
tags = repo.tags + [head]
|
21
24
|
tags.sort! {|x,y| y.commit.authored_date <=> x.commit.authored_date}
|
22
25
|
|
@@ -4,11 +4,7 @@ module Beaker
|
|
4
4
|
module Answers
|
5
5
|
module Version34
|
6
6
|
def self.answers(hosts, master_certname, options)
|
7
|
-
master = only_host_with_role(hosts, 'master')
|
8
|
-
|
9
7
|
the_answers = Version32.answers(hosts, master_certname, options)
|
10
|
-
the_answers[master.name][:q_jvm_puppetmaster] = 'y'
|
11
|
-
|
12
8
|
return the_answers
|
13
9
|
end
|
14
10
|
end
|
data/lib/beaker/version.rb
CHANGED
data/spec/beaker/answers_spec.rb
CHANGED
@@ -73,13 +73,6 @@ module Beaker
|
|
73
73
|
expect( host[:answers] ).to be === answers[host.name]
|
74
74
|
end
|
75
75
|
end
|
76
|
-
|
77
|
-
it 'should add q_jvm_puppetmaster to the master answers' do
|
78
|
-
@ver = '3.4'
|
79
|
-
answers = subject.answers( hosts, master_certname, options )
|
80
|
-
expect( subject.answers( hosts, master_certname, options )['vm1']).to include :q_jvm_puppetmaster
|
81
|
-
end
|
82
|
-
|
83
76
|
end
|
84
77
|
|
85
78
|
describe Version32 do
|