beaker 1.17.0 → 1.17.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2ZiN2MxNTYzZTY2M2QyZTViYzczZTBkYTY0NWNkYzQ2MDY4M2QwNQ==
+    ODE0YzQ4ODExNWQ2NjRhZDcwZmI0MmZjNWE1YTkyMDlkOTQzNDUyYw==
   data.tar.gz: !binary |-
-    ZWMwNTkxYzVlMTI1NzRiMjQwMWIxODdlMTIxMzJlMjZkYjE4OWIwYg==
+    MzliNzczZTJjZGVlMjNlNjJhMjYyMTFkMGQ4YjlhMTIwNTFkMzBlNg==
 SHA512:
   metadata.gz: !binary |-
-    ZGQ0Yzk2MDRmNzk4OGIwZDE0N2NiZGRjZjlkMWMzMTk3ZWMwYmQ0OWY2OTg3
-    ZGI0YjVmM2I3N2UwNjA0ZjlhZWEyNjlkNGZjYWIyMjg0NmFmMWIxOWFkOWM1
-    OTlkZjI0Mzc4ZjI1MDEyNTFjNDdkOTgxMGU3MGZmMzQ4NTI0ZTE=
+    MTdmODVkY2ZlYTI2YjRjNTJkNTlmNjEzYTk3NWYzYWI5NDhmMzNjYWE2N2E3
+    YmE1ODI4NDgxOWUzMWZkNzhlZDlhY2IyYTEzMGIxODA1Yzg1Mzg3ZTczYTcz
+    NTgyMzIzZGQ3YTRlZDI3ODhhNDYyOWIzMTYwNGE0MjM4YmRiOWU=
   data.tar.gz: !binary |-
-    NWQ4NTZmMWJjOGExMmNiZjU2NGUxZDgzNjk1NmE2ZTE4YzU3ZGY1ZjU2NWIy
-    YTJlOWI4NjNjZWUwZDJmMjVmNjA5MTE1NWM4NTgwNTkwNDZlNzVhNjQyNzRh
-    ZTUwMjFlODY5M2EyNTI3YWY5YTM3YTZkYmMyMjliM2RlYWIyM2Y=
+    MzE3ZGQxMjc4Yjk0YjYwMmJlNWI0ODcwNGE4YjBmNzkzMmEwMjk5MjJjZjRl
+    MjVmMDY0YjEzYjgzODM0YmM2MDgyZjEwMDZlMjJlMjQ1MjlmYThiMDUxZjc3
+    ODM2NzhlZWU0MzJhMDUyZWYzMmM5ODRhYzk1ZDVhZjQxMDExYjc=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # beaker - History
 ## Tags
-* [LATEST - 11 Aug, 2014 (d0719d5d)](#LATEST)
+* [LATEST - 12 Aug, 2014 (0cb4134e)](#LATEST)
+* [beaker1.17.0 - 12 Aug, 2014 (fb482b56)](#beaker1.17.0)
 * [beaker1.16.0 - 17 Jul, 2014 (c1267696)](#beaker1.16.0)
 * [beaker1.15.0 - 8 Jul, 2014 (82bb4ef9)](#beaker1.15.0)
 * [beaker1.14.1 - 3 Jul, 2014 (d2e750d5)](#beaker1.14.1)
@@ -52,7 +53,59 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 11 Aug, 2014 (d0719d5d)
+### <a name = "LATEST">LATEST - 12 Aug, 2014 (0cb4134e)
+
+* (HISTORY) update HISTORY.md for 1.17.1 gem (0cb4134e)
+
+* (GEM) create beaker 1.17.1 gem (07b67f32)
+
+* Merge pull request #397 from anodelman/maint (3e86c6f8)
+
+
+```
+Merge pull request #397 from anodelman/maint
+
+(MAINT) add ability to generate history for branch other than 'master'
+```
+* Merge pull request #398 from nicklewis/revert-jvm-master (d9c67d1e)
+
+
+```
+Merge pull request #398 from nicklewis/revert-jvm-master
+
+Revert "(QENG-997) Add PE installer answer for jvm puppet."
+```
+* Revert "(QENG-997) Add PE installer answer for jvm puppet." (215e115f)
+
+
+```
+Revert "(QENG-997) Add PE installer answer for jvm puppet."
+
+This reverts commit b06b6313de24da82a031b6b04dc95042812b4445.
+
+The installer doesn't actually function with this answer set, so we
+certainly shouldn't be making it the default.
+```
+* (MAINT) add ability to generate history for branch other than 'master' (76ad94d5)
+
+
+```
+(MAINT) add ability to generate history for branch other than 'master'
+
+- want to be able to generate a new HISTORY.md file based upon a
+  provided branch name
+```
+### <a name = "beaker1.17.0">beaker1.17.0 - 12 Aug, 2014 (fb482b56)
+
+* Merge pull request #396 from anodelman/make-gem (fb482b56)
+
+
+```
+Merge pull request #396 from anodelman/make-gem
+
+(GEM) create beaker 1.17.0 gem
+```
+* (HISTORY) add history for 1.17.0 gem (c04acf4d)
 
 * (GEM) create beaker 1.17.0 gem (b2528072)
 
@@ -553,11 +606,11 @@ restarted.
 ```
 * (QENG-807) add --collect-perf-data option, rspec tests, and yard docs (8d1a891d)
 
-* (QENG-188) Allow foss runs to use service scripts (44d18d5f)
+* (QENG-188) Allow foss runs to use service scripts, take 2 (577fce4d)
 
 
 ```
-(QENG-188) Allow foss runs to use service scripts
+(QENG-188) Allow foss runs to use service scripts, take 2
 
 Prior to this commit, any run of beaker with a non-pe master that
 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.
 
 Any existing test suite which does not 'opt-in' to any of these service
 host changes by specifying any of the above properties should not be
-effected by this commit.
+effected by this commit.  The exception to this is that PE runs will use
+graceful restarts automatically with this commit.
 
 There is also a spec related change to the FakeHost helper, which
 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
 Beaker::Host.create to provide a host instance that is then extended
 with the MockedExec module stubbing the exec facilities for testing.
 ```
-* (QENG-188) Allow foss runs to use service scripts, take 2 (577fce4d)
+* (QENG-188) Allow foss runs to use service scripts (44d18d5f)
 
 
 ```
-(QENG-188) Allow foss runs to use service scripts, take 2
+(QENG-188) Allow foss runs to use service scripts
 
 Prior to this commit, any run of beaker with a non-pe master that
 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.
 
 Any existing test suite which does not 'opt-in' to any of these service
 host changes by specifying any of the above properties should not be
-effected by this commit.  The exception to this is that PE runs will use
-graceful restarts automatically with this commit.
+effected by this commit.
 
 There is also a spec related change to the FakeHost helper, which
 previously was a stub pretending to provide Beaker::Host like facilities

data/history.rb

@@ -1,4 +1,6 @@
-# Generates a HISTORY.md file for your repo based on tags and commits
+# Generates a HISTORY.md file for your repo based on tags and commits, defaults to history for 
+#     master branch but can generate history for specified branch
+#
 # Requires: gem install gitlab-grit
 # Usage: ruby history.rb /your/repo/directory
 #
@@ -7,16 +9,17 @@
 require 'grit'
 
 if ARGV.size < 1
-  p "Usage: ruby history.rb /your/repo/directory"
+  p "Usage: ruby history.rb /your/repo/directory branch(defaults to master)"
   exit
 end
 
 output_file = 'HISTORY.md'
 repo_dir = ARGV[0]
+branch = ARGV[1] || 'master'
 output = "# #{File.basename(File.absolute_path(repo_dir))} - History\n"
 
 repo = Grit::Repo.new(repo_dir)
-head = Grit::Tag.new(repo.commits.first.sha, repo, repo.commits.first.id)
+head = Grit::Tag.new(repo.commits(branch).first.sha, repo, repo.commits(branch).first.id)
 tags = repo.tags + [head]
 tags.sort! {|x,y| y.commit.authored_date <=> x.commit.authored_date}
 

data/lib/beaker/answers/version34.rb

@@ -4,11 +4,7 @@ module Beaker
   module Answers
     module Version34
       def self.answers(hosts, master_certname, options)
-        master = only_host_with_role(hosts, 'master')
-
         the_answers = Version32.answers(hosts, master_certname, options)
-        the_answers[master.name][:q_jvm_puppetmaster] = 'y'
-
         return the_answers
       end
     end

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '1.17.0'
+    STRING = '1.17.1'
   end
 end

data/spec/beaker/answers_spec.rb

@@ -73,13 +73,6 @@ module Beaker
           expect( host[:answers] ).to be === answers[host.name]
         end
       end
-
-      it 'should add q_jvm_puppetmaster to the master answers' do
-        @ver = '3.4'
-        answers = subject.answers( hosts, master_certname, options )
-        expect( subject.answers( hosts, master_certname, options )['vm1']).to include :q_jvm_puppetmaster
-      end
-
     end
 
     describe Version32 do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.17.1
 platform: ruby
 authors:
 - Puppetlabs