beaker 2.38.1 → 2.39.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTlkMmEzMzc3MDkyN2Q0NGIwZWQ2YmRjZGUyNDFlYzFmNmQ3OGQ2MA==
+    MGY4YTE4YjI3YmU5ZWE5ZjQxODA5Y2Y3OGU0ZTViMmRmNmRkODg0Mw==
   data.tar.gz: !binary |-
-    MTNmYWMwZTQ0YWE3YzM1ZjJiYmQ3NDk1ZGMyNDViZTEwM2I3MTdiOA==
+    NDU0ZTJmYTg0ZjAyMTM1YTI2ZGQ4OTlhNTU2YzY0NGM0ZGFkYjNlZA==
 SHA512:
   metadata.gz: !binary |-
-    NTZiOGYxMDdmZjgxYjVkODBkOTA0NTVhZmY3OGE0OGQyNjIyMzlmNzUxOWU2
-    Njg3OGMxZTAzZTZlYTI4Mzg4MGQyMzgzNWIyN2U1MmEzM2ZmZWY4ODAxM2M2
-    NzViMmU1ZjVlMjhlYmFlYmJkZDY5NzYzOTc0MTg1ZmUwNzE5NjI=
+    YzhhMWM4NzIyZGU0Njg2NzcyZjI0MzQ1NzhmNjE2ZTUwNjU0NmE3MmQzOGIw
+    ZjhhYjk3Y2YzZjU3NTFhZTAyMDNhMzRlN2RhODJiYTQ5MzNiMjIyY2MzM2Vi
+    YTg5OTYzOGViNjkwYzM3ZTVjNzEyZGMxYzI0Zjg1OGU0ZGE3OTc=
   data.tar.gz: !binary |-
-    YzZiNTYwMzU1MzA1ZmNjYTEwZWU3OTAxMDc5NTNkYTU4ZDYzOTU2NDRjNTI1
-    ODA4Y2U0Mjg1NTY1ODdlZmI4NjgxNGMwZWIyYWY2MWQ4ZGQ5MjUzNzM1OWIz
-    Njc5OWY0ZTNjMjU5N2VhNDcyZGNhZmRjNTA1NWY0ODRhNzMwZDI=
+    ODBmZjQ2NjE5MGZhZjRiZWEyZjlmMjE1NTBmYzgwMWRkM2YzZjBhYzFlZWY4
+    YWJjOWYwNTU3ZGYyYjU0YTQwZmJiZTBmOGZiMzIyMmRlYTA0MTQyNTU1OTVh
+    NjA4MTYxOTkwNjIzNTBhNWI0MzNlZDcxNDM1YWNjYzI2N2YwZGU=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 31 Mar, 2016 (e131537d)](#LATEST)
+* [LATEST - 6 Apr, 2016 (1a0fe8ac)](#LATEST)
+* [2.38.1 - 31 Mar, 2016 (124b91b8)](#2.38.1)
 * [2.38.0 - 30 Mar, 2016 (0878bff7)](#2.38.0)
 * [2.37.0 - 15 Mar, 2016 (a6c2297b)](#2.37.0)
 * [2.36.0 - 9 Mar, 2016 (5fd86b67)](#2.36.0)
@@ -114,7 +115,72 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 31 Mar, 2016 (e131537d)
+### <a name = "LATEST">LATEST - 6 Apr, 2016 (1a0fe8ac)
+
+* (GEM) update beaker version to 2.39.0 (1a0fe8ac)
+
+* Merge pull request #1083 from samwoods1/fix_junit_skipped (244d9706)
+
+
+```
+Merge pull request #1083 from samwoods1/fix_junit_skipped
+
+(maint) change junit skip to skipped to match schema
+```
+* Merge pull request #1088 from puppetlabs/added-beaker-libraries (47fe09db)
+
+
+```
+Merge pull request #1088 from puppetlabs/added-beaker-libraries
+
+(maint) Add more libraries to Beaker-Libraries.md
+```
+* Merge pull request #1086 from pinkypie/BKR-430 (4510c968)
+
+
+```
+Merge pull request #1086 from pinkypie/BKR-430
+
+(BKR-430) Adding rake tasks for running beaker acceptance tests.
+```
+* Merge pull request #1089 from tvpartytonight/BKR-708 (307c231d)
+
+
+```
+Merge pull request #1089 from tvpartytonight/BKR-708
+
+(BKR-708) Add ubuntu xenial as a supported platform
+```
+* (BKR-708) Add ubuntu xenial as a supported platform (8ef1e057)
+
+
+```
+(BKR-708) Add ubuntu xenial as a supported platform
+
+This change adds xenial support to beaker.
+```
+* (maint) Add more libraries to Beaker-Libraries.md (26aab9b0)
+
+* (BKR-430) Adding rake tasks for running Beaker acceptance tests. (e463effd)
+
+
+```
+(BKR-430) Adding rake tasks for running Beaker acceptance tests.
+'rake acceptance' for the main acceptance run.
+Also the following individual tasks for individual sets of tests.
+rake test:base
+rake test:hypervisor
+rake test:puppetpe
+rake test:puppetgem
+rake test:puppetgit
+rake test:puppetpkg
+rake test:puppet
+```
+* (maint) change junit skip to skipped to match schema (25b7abcc)
+
+### <a name = "2.38.1">2.38.1 - 31 Mar, 2016 (124b91b8)
+
+* (HISTORY) update beaker history for gem release 2.38.1 (124b91b8)
 
 * (GEM) update beaker version to 2.38.1 (e131537d)
 

data/Rakefile

@@ -1,4 +1,8 @@
 require 'open3'
+require 'securerandom'
+require 'beaker-hostgenerator'
+
+HOSTS_PRESERVED  = 'log/latest/hosts_preserved.yml'
 
 task :default => [ 'test:spec' ]
 
@@ -10,6 +14,10 @@ task :spec do
   Rake::Task['test:spec'].invoke
 end
 
+
+task :acceptance => ['test:base', 'test:puppetgit', 'test:hypervisor']
+
+
 task :yard do
   Rake::Task['docs:gen'].invoke
 end
@@ -23,7 +31,118 @@ task :travis do
   Rake::Task['spec'].invoke
 end
 
+module HarnessOptions
+  defaults = {
+      :tests  => ['tests'],
+      :log_level => 'debug',
+      :preserve_hosts => 'onfail',
+  }
+
+  DEFAULTS = defaults
+
+  def self.get_options(file_path)
+    puts "Attempting to merge config file: #{file_path}"
+    if File.exists? file_path
+      options = eval(File.read(file_path), binding)
+    else
+      puts "No options file found at #{File.expand_path(file_path)}... skipping"
+    end
+    options || {}
+  end
+
+  def self.get_mode_options(mode)
+    get_options("./acceptance/config/#{mode}/acceptance-options.rb")
+  end
+
+  def self.get_local_options
+    get_options('./acceptance/local_options.rb')
+  end
+
+  def self.final_options(mode, intermediary_options = {})
+    mode_options = get_mode_options(mode)
+    local_overrides = get_local_options
+    final_options = DEFAULTS.merge(mode_options)
+    final_options.merge!(intermediary_options)
+    final_options.merge!(local_overrides)
+  end
+
+end
+
+def hosts_file_env
+  ENV['BEAKER_HOSTS']
+end
+
+def hosts_opt(use_preserved_hosts=false)
+  if use_preserved_hosts
+    "--hosts=#{HOSTS_PRESERVED}"
+  else
+    if hosts_file_env
+      "--hosts=#{hosts_file_env}"
+    else
+      "--hosts=tmp/#{HOSTS_FILE}"
+    end
+  end
+end
+
+def agent_target
+  ENV['TEST_TARGET'] || 'redhat7-64af'
+end
+
+def master_target
+  ENV['MASTER_TEST_TARGET'] || 'redhat7-64default.mdcal'
+end
+
+def test_targets
+  ENV['LAYOUT'] || "#{master_target}-#{agent_target}"
+end
+
+HOSTS_FILE = "#{test_targets}-#{SecureRandom.uuid}.yaml"
+
+def beaker_test(mode = :base, options = {})
+
+  preserved_hosts_mode = options[:hosts] == HOSTS_PRESERVED
+  final_options = HarnessOptions.final_options(mode, options)
+
+  options_opt  = ""
+  # preserved hosts can not be used with an options file (BKR-670)
+  #   one can still use OPTIONS
+
+  if !preserved_hosts_mode
+    options_file = 'merged_options.rb'
+    options_opt  = "--options-file=#{options_file}"
+    File.open(options_file, 'w') do |merged|
+      merged.puts <<-EOS
+# Copy this file to local_options.rb and adjust as needed if you wish to run
+# with some local overrides.
+      EOS
+      merged.puts(final_options)
+    end
+  end
+
+  tests = ENV['TESTS'] || ENV['TEST']
+  tests_opt = ""
+  tests_opt = "--tests=#{tests}" if tests
+
+  overriding_options = ENV['OPTIONS'].to_s
+
+  args = [options_opt, hosts_opt(preserved_hosts_mode), tests_opt,
+          *overriding_options.split(' ')].compact
+
+  sh("beaker", *args)
+end
+
+
 namespace :test do
+  USAGE = <<-EOS
+You may set BEAKER_HOSTS=config/nodes/foo.yaml or include it in an acceptance-options.rb for Beaker,
+or specify TEST_TARGET in a form beaker-hostgenerator accepts, e.g. ubuntu1504-64a.
+You may override the default master test target by specifying MASTER_TEST_TARGET.
+You may set TESTS=path/to/test,and/more/tests.
+You may set additional Beaker OPTIONS='--more --options'
+If there is a Beaker options hash in a ./acceptance/local_options.rb, it will be included.
+Commandline options set through the above environment variables will override settings in this file.
+  EOS
+
   desc 'Run specs and check for deprecation warnings'
   task :spec do
     original_dir = Dir.pwd
@@ -48,8 +167,69 @@ namespace :test do
     end
     Dir.chdir( original_dir )
   end
+
+  desc <<-EOS
+Run the base beaker acceptance tests
+#{USAGE}
+  EOS
+  task :base  => 'gen_hosts' do
+    beaker_test(:base)
+  end
+
+  desc <<-EOS
+Run the hypervisor beaker acceptance tests
+#{USAGE}
+  EOS
+  task :hypervisor  => 'gen_hosts' do
+    beaker_test(:hypervisor)
+  end
+
+  desc <<-EOS
+Run the puppet beaker acceptance tests on a pe install.
+#{USAGE}
+  EOS
+  task :puppetpe  => 'gen_hosts' do
+    beaker_test(:puppetpe)
+  end
+
+  desc <<-EOS
+Run the puppet beaker acceptance tests on a puppet gem install.
+#{USAGE}
+  EOS
+  task :puppetgem  => 'gen_hosts' do
+    beaker_test(:puppetgem)
+  end
+
+  desc <<-EOS
+Run the puppet beaker acceptance tests on a puppet git install.
+#{USAGE}
+  EOS
+  task :puppetgit  => 'gen_hosts' do
+    beaker_test(:puppetgit)
+  end
+
+  desc <<-EOS
+Run the puppet beaker acceptance tests on a puppet package install.
+#{USAGE}
+  EOS
+  task :puppetpkg => 'gen_hosts' do
+    beaker_test(:puppetpkg)
+  end
+
+  desc 'Generate Beaker Host Config File'
+  task :gen_hosts do
+    if hosts_file_env
+      next
+    end
+    cli = BeakerHostGenerator::CLI.new([test_targets])
+    FileUtils.mkdir_p('tmp') # -p ignores when dir already exists
+    File.open("tmp/#{HOSTS_FILE}", 'w') do |fh|
+      fh.print(cli.execute)
+    end
+  end
 end
 
+
 ###########################################################
 #
 #   History Tasks

data/acceptance/config/base/acceptance-options.rb

@@ -0,0 +1,3 @@
+{
+    :tests                => 'acceptance/tests/base'
+}.merge(eval File.read('acceptance/config/acceptance-options.rb'))

data/acceptance/config/hypervisor/acceptance-options.rb

@@ -0,0 +1,3 @@
+{
+    :tests                => 'acceptance/tests/hypervisor'
+}.merge(eval File.read('acceptance/config/acceptance-options.rb'))

data/acceptance/config/puppetgem/acceptance-options.rb

@@ -0,0 +1,4 @@
+{
+    :pre_suite            => 'acceptance/pre_suite/puppet_gem/install.rb',
+    :tests                => 'acceptance/tests/puppet'
+}.merge(eval File.read('acceptance/config/acceptance-options.rb'))

data/acceptance/config/puppetgit/acceptance-options.rb

@@ -0,0 +1,4 @@
+{
+    :pre_suite            => 'acceptance/pre_suite/puppet_git/install.rb',
+    :tests                => 'acceptance/tests/puppet'
+}.merge(eval File.read('acceptance/config/acceptance-options.rb'))

data/acceptance/config/puppetpe/acceptance-options.rb

@@ -0,0 +1,5 @@
+{
+    :pre_suite            => 'acceptance/pre_suite/pe/install.rb',
+    :tests                => 'acceptance/tests/puppet',
+    :pe_dir               => 'http://neptune.puppetlabs.lan/archives/releases/3.7.2'
+}.merge(eval File.read('acceptance/config/acceptance-options.rb'))

data/acceptance/config/puppetpkg/acceptance-options.rb

@@ -0,0 +1,4 @@
+{
+    :pre_suite            => 'acceptance/pre_suite/puppet_pkg/install.rb',
+    :tests                => 'acceptance/tests/puppet'
+}.merge(eval File.read('acceptance/config/acceptance-options.rb'))

data/beaker.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake', '~> 10.1'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'pry', '~> 0.10'
+  s.add_development_dependency 'beaker-hostgenerator'
 
   # Documentation dependencies
   s.add_development_dependency 'yard'

data/docs/Beaker-Libraries.md

@@ -4,5 +4,7 @@ by Beaker.
 
 | Name               | Description                                                         | Docs                                                            |
 |:-------------------|:--------------------------------------------------------------------|:----------------------------------------------------------------|
-| Master Manipulator | A Beaker library for changing configuration on a Puppet Master      | [Github Repo](https://github.com/puppetlabs/master_manipulator) |
-| beaker_windows     | A Beaker library that provides helpers for testing on Windows hosts | [Github Repo](https://github.com/puppetlabs/beaker_windows)     |
+| Master Manipulator | Easy DSL extension for changing configuration on a Puppet Master    | [Github Repo](https://github.com/puppetlabs/master_manipulator) |
+| beaker_windows     | Useful helpers for testing on Windows hosts                         | [Github Repo](https://github.com/puppetlabs/beaker_windows)     |
+| Puppet Install Helper | Use environment variables for choosing which puppet version to install | [Github Repo](https://github.com/puppetlabs/beaker-puppet_install_helper) |
+| testmode_switcher   | [prototype] run your puppet module tests in master/agent, apply or local mode | [Github Repo](https://github.com/puppetlabs/beaker-testmode_switcher)     |

data/lib/beaker/platform.rb

@@ -10,7 +10,8 @@ module Beaker
                      "wheezy"  => "7",
                      "squeeze" => "6",
                    },
-        :ubuntu => { "wily"    => "1510",
+        :ubuntu => { "xenial"    => "1604",
+                     "wily"    => "1510",
                      "vivid"   => "1504",
                      "utopic"  => "1410",
                      "trusty"  => "1404",

data/lib/beaker/test_suite.rb

@@ -182,7 +182,7 @@ module Beaker
             suite['tests']    = test_count
             suite['errors']   = errored_tests
             suite['failures'] = failed_tests
-            suite['skip']     = skipped_tests
+            suite['skipped']     = skipped_tests
             suite['pending']  = pending_tests
             suite['total']    = @total_tests
             suite['time']     = "%f" % (stop_time - start_time)
@@ -218,7 +218,7 @@ module Beaker
               end
 
               if test.test_status == :skip
-                status = Nokogiri::XML::Node.new('skip', doc)
+                status = Nokogiri::XML::Node.new('skipped', doc)
                 status['type'] =  test.test_status.to_s
                 item.add_child(status)
               end

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.38.1'
+    STRING = '2.39.0'
   end
 end

data/spec/beaker/platform_spec.rb

@@ -77,6 +77,11 @@ module Beaker
         expect( platform.with_version_codename ).to be === 'debian-squeeze-xxx'
       end
 
+      it "can convert unbuntu-1604-xxx to ubuntu-xenial-xxx" do
+        @name = 'ubuntu-1604-xxx'
+        expect( platform.with_version_codename ).to be === 'ubuntu-xenial-xxx'
+
+      end
       it "can convert ubuntu-1310-xxx to ubuntu-saucy-xxx" do
         @name = 'ubuntu-1310-xxx'
         expect( platform.with_version_codename ).to be === 'ubuntu-saucy-xxx'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.38.1
+  version: 2.39.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2016-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -94,6 +94,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: beaker-hostgenerator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -456,6 +470,12 @@ files:
 - README.md
 - Rakefile
 - acceptance/config/acceptance-options.rb
+- acceptance/config/base/acceptance-options.rb
+- acceptance/config/hypervisor/acceptance-options.rb
+- acceptance/config/puppetgem/acceptance-options.rb
+- acceptance/config/puppetgit/acceptance-options.rb
+- acceptance/config/puppetpe/acceptance-options.rb
+- acceptance/config/puppetpkg/acceptance-options.rb
 - acceptance/fixtures/README.md
 - acceptance/fixtures/files/failing_shell_script.txt
 - acceptance/fixtures/files/retry_script.txt