beaker 0.0.0 → 1.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2IyYWFiMWQxN2RhMTU1NTlmY2FjNDFhNjYzNDFiNmZiMDMyYzc1YQ==
+    ZWQyZDI5MDhjOTdlYjFmMWM0NmMyNzVjYWYyZTMxMjZkNjViMTk1Mg==
   data.tar.gz: !binary |-
-    YmIyMWI4NDYwZDkyZTRmNjJmMTFiODgyYzkxMjZmNTllYTFkY2Q0Ng==
+    ODYxMGI2Y2E3NDc3NTViMzBhYjRhMGNlNDkxNDljMmYyMDcwNmZjYw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZGQ0YjUxZWU5YzAzZjFjZDhmNzBmYWEyNjdkZDE3NTIwNDRlYjMxNmFkYmEy
-    ODc3ZmI0ZjU5MzI1NmQ2MjFiY2ZhNDczYjEyNGE1ZDA4OGYzYTk5ZTU2YmMy
-    NWVhOTMyMmZlYTg1NzRlYTU5YWZmNTk5MTNlODgzMDcwNWI2Mjk=
+    YmViMDgxMTgwZjQ3NDk5M2NhZDkwYzAwMDA0MDNlMGE4NDA1NDI4YjM4ZTkw
+    NTFhMDBhMTczMzZmMTgzMmE2YmIxNzlhMDY3MzAyMGVkY2YyMGVmMmU0Njdh
+    ZThlYWE5NzY2MDZiZTg1ZTk1OTZhZmFiZDcwZTk3ZDdlOGJiYjA=
   data.tar.gz: !binary |-
-    NTBlYjdiMjJmM2YyZWI2NDk1ZDZkYjEyYTdhNDc1OTkyYjhkMTI0MGViNTZi
-    N2NmNzAzZTU4MmE4N2ZjYTBkMzM0YzNlOWEyM2M1MTQ3YTYyNTA0MGFiNmNh
-    MTZhYTYyZTEyM2YwZGNhMjcwZWE3ODdjOTMwMWRjZTE3NzhmNzA=
+    ZDFiODE1ZjRlNjkzNDE5ODA4NmUxYmU3MmExZTQ4NDA4MTNjYzg3NjY1MmI3
+    YWNhYmJmZDcyNjM3ZGRiNDJlOGFmYzNmNTI1YjY5NWIwNDAyMzJhNjMwYjVk
+    MzUyMmI2YWQ3ODFjNWMyOTRkNjJmOTUwNjBmMDgwMzY5NmI5Mjg=

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+script: "bundle exec rspec"
+notifications:
+  email: false
+rvm:
+  - 2.0.0
+  - 1.9.3
+  - 1.8.7

data/README.md

@@ -34,7 +34,7 @@ Running Systest requires at least one 'System Under Test' (SUT) upon which to ru
 ## Prepare a Test Configuration File ##
   - The test harness is configuration driven
   - The config file is yaml formatted
-  - The type of insallation and configuration is dictated by the config file, especialy for PE
+  - The type of insallation and configuration is dictated by the config file, especially for PE
 
 Here we have the host 'ubuntu-1004-64', a 64 bit Ubuntu box, serving as Puppet Master,
 Dashboard, and Agent; the host "ubuntu-1004-32", a 32-bit Ubunutu node, will be a 
@@ -119,11 +119,11 @@ For example:
 
 
 ## VMWare Fusion support ##
-Pre-requisite: Fission gem installed and configured, including a ~/.fissionrc 
-that points to the `vmrun` executable and where VMs can be found.
+Pre-requisite: Fission gem installed and configured, including a `~/.fissionrc`
+that points to the `vmrun` executable and where virtual machines can be found.
   Example `.fissionrc` file (it's YAML):
-    ---
-    vm_dir: "/Directory/containing/my/.VMX/files"
+
+    vm_dir: "/Directory/containing/my/.vmwarevm/files/"
     vmrun_bin: "/Applications/VMware Fusion.app/Contents/Library/vmrun"
 
 You can then use the following arguments in the node configuration:
@@ -136,7 +136,7 @@ There are a few additional options available in your configuration file. Each ho
 section can now use:
 
 - `vmname`: This is useful if the hostname of the VM doesn't match the name of
-  the .VMX file on disk. The alias should be something fission can load.
+  the `.vmwarevm` file on disk. The alias should be something fission can load.
 
 
 Example:

data/beaker.gemspec

@@ -6,7 +6,7 @@ less_than_one_nine = ruby_conf['MAJOR'].to_i == 1 && ruby_conf['MINOR'].to_i < 9
 
 Gem::Specification.new do |s|
   s.name        = "beaker"
-  s.version     = '0.0.0'
+  s.version     = '1.0.0'
   s.authors     = ["Puppetlabs"]
   s.email       = ["delivery@puppetlabs.com"]
   s.homepage    = "https://github.com/puppetlabs/beaker"
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Testing dependencies
-  s.add_development_dependency 'rspec', '2.11.0'
+  s.add_development_dependency 'rspec', '~> 2.14.0'
   s.add_development_dependency 'fakefs', '0.4'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'simplecov' unless less_than_one_nine
@@ -37,6 +37,10 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rbvmomi'
   s.add_runtime_dependency 'blimpy'
   s.add_runtime_dependency 'nokogiri', '1.5.10'
+  s.add_runtime_dependency 'mime-types', '1.25' if RUBY_VERSION < "1.9"
   s.add_runtime_dependency 'fission' if RUBY_PLATFORM =~ /darwin/i
   s.add_runtime_dependency 'inifile'
+  #unf is an 'optional' fog dependency, but it warns when it is missing
+  #  see https://github.com/fog/fog/pull/2320/commits
+  s.add_runtime_dependency 'unf'
 end

data/lib/beaker.rb

@@ -1,7 +1,7 @@
 require 'rubygems' unless defined?(Gem)
 module Beaker
 
-  %w( utils test_suite test_config result command options_parsing network_manager cli ).each do |lib|
+  %w( utils test_suite result command options network_manager cli ).each do |lib|
     begin
       require "beaker/#{lib}"
     rescue LoadError

data/lib/beaker/answers.rb

@@ -1,4 +1,4 @@
-[ 'version30', 'version28' ].each do |file|
+[ 'version30', 'version28', 'version20' ].each do |file|
   begin
     require "beaker/answers/#{file}"
   rescue LoadError
@@ -7,20 +7,47 @@
 end
 
 module Beaker
+  # This module provides static methods for accessing PE answer file
+  # information.
   module Answers
 
+    # When given a Puppet Enterprise version, a list of hosts and other
+    # qualifying data this method will return a hash (keyed from the hosts)
+    # of default Puppet Enterprise answer file data hashes.
+    #
+    # @param [String] version Puppet Enterprise version to generate answer data for
+    # @param [Array<Beaker::Host>] hosts An array of host objects.
+    # @param [String] master_certname Hostname of the puppet master.
+    # @param [Hash] options options for answer files
+    # @option options [Symbol] :type Should be one of :upgrade or :install.
+    # @return [Hash] A hash (keyed from hosts) containing hashes of answer file
+    #   data.
     def self.answers(version, hosts, master_certname, options)
 
       case version
-        when /\A3\.0/
-          Version30.answers(hosts, master_certname, options)
-        when /\A2\.8/
-          Version28.answers(hosts, master_certname, options)
-        else
-          raise NotImplementedError, "Don't know how to generate answers for #{version}"
+      when /\A3\.[[:digit:]]/ # All 3.x so far have the same answers
+        Version30.answers(hosts, master_certname, options)
+      when /\A2\.8/
+        Version28.answers(hosts, master_certname, options)
+      when /\A2\.0/
+        Version20.answers(hosts, master_certname, options)
+      else
+        raise NotImplementedError, "Don't know how to generate answers for #{version}"
       end
     end
 
+    # This converts a data hash provided by answers, and returns a Puppet
+    # Enterprise compatible answer file ready for use.
+    #
+    # @param [Beaker::Host] host Host object in question to generate the answer
+    #   file for.
+    # @param [Hash] answers Answers hash as returned by #answers
+    # @return [String] a string of answers
+    # @example Generating an answer file for a series of hosts
+    #   hosts.each do |host|
+    #     answers = Beaker::Answers.answers("2.0", hosts, "master")
+    #     create_remote_file host, "/mypath/answer", Beaker::Answers.answer_string(host, answers)
+    #  end
     def self.answer_string(host, answers)
       answers[host.name].map { |k,v| "#{k}=#{v}" }.join("\n")
     end

data/lib/beaker/answers/version20.rb

@@ -0,0 +1,124 @@
+module Beaker
+  module Answers
+    # This class provides answer file information for PE version 2.0
+    #
+    # @api private
+    module Version20
+      # Return answer data for a host
+      #
+      # @param [Beaker::Host] host Host to return data for
+      # @param [String] master_certname Hostname of the puppet master.
+      # @param [Beaker::Host] master Host object representing the master
+      # @param [Beaker::Host] dashboard Host object representing the dashboard
+      # @param [Hash] options options for answer files
+      # @option options [Symbol] :type Should be one of :upgrade or :install.
+      # @return [Hash] A hash (keyed from hosts) containing hashes of answer file
+      #   data.
+      def self.host_answers(host, master_certname, master, dashboard, options)
+        return nil if host['platform'] =~ /windows/
+
+        agent_a = {
+          :q_install => 'y',
+          :q_puppetagent_install => 'y',
+          :q_puppet_cloud_install => 'y',
+          :q_puppet_symlinks_install => 'y',
+          :q_vendor_packages_install => 'y',
+          :q_puppetagent_certname => host,
+          :q_puppetagent_server => master,
+
+          # Disable console and master by default
+          # This will be overridden by other blocks being merged in
+          :q_puppetmaster_install => 'n',
+          :q_puppet_enterpriseconsole_install => 'n',
+        }
+
+        master_a = {
+          :q_puppetmaster_install => 'y',
+          :q_puppetmaster_certname => master_certname,
+          :q_puppetmaster_install => 'y',
+          :q_puppetmaster_dnsaltnames => master_certname+",puppet",
+          :q_puppetmaster_enterpriseconsole_hostname => dashboard,
+          :q_puppetmaster_enterpriseconsole_port => 443,
+          :q_puppetmaster_forward_facts => 'y',
+        }
+
+        if master['ip']
+          master_a[:q_puppetmaster_dnsaltnames]+=","+master['ip']
+        end
+
+        dashboard_user = "'#{ENV['q_puppet_enterpriseconsole_auth_user_email'] || 'admin@example.com'}'"
+        smtp_host = "'#{ENV['q_puppet_enterpriseconsole_smtp_host'] || dashboard}'"
+        dashboard_password = ENV['q_puppet_enterpriseconsole_auth_password'] || '~!@#$%^*-/ aZ'
+        smtp_port = "'#{ENV['q_puppet_enterpriseconsole_smtp_port'] || 25}'"
+        smtp_username = ENV['q_puppet_enterpriseconsole_smtp_username']
+        smtp_password = ENV['q_puppet_enterpriseconsole_smtp_password']
+        smtp_use_tls = "'#{ENV['q_puppet_enterpriseconsole_smtp_use_tls'] || 'n'}'"
+
+        console_a = {
+          :q_puppet_enterpriseconsole_install => 'y',
+          :q_puppet_enterpriseconsole_database_install => 'y',
+          :q_puppet_enterpriseconsole_auth_database_name => 'console_auth',
+          :q_puppet_enterpriseconsole_auth_database_user => 'mYu7hu3r',
+          :q_puppet_enterpriseconsole_auth_database_password => "'#{dashboard_password}'",
+          :q_puppet_enterpriseconsole_database_name => 'console',
+          :q_puppet_enterpriseconsole_database_user => 'mYc0nS03u3r',
+          :q_puppet_enterpriseconsole_database_root_password => "'#{dashboard_password}'",
+          :q_puppet_enterpriseconsole_database_password => "'#{dashboard_password}'",
+          :q_puppet_enterpriseconsole_inventory_hostname => host,
+          :q_puppet_enterpriseconsole_inventory_certname => host,
+          :q_puppet_enterpriseconsole_inventory_dnsaltnames => master,
+          :q_puppet_enterpriseconsole_inventory_port => 8140,
+          :q_puppet_enterpriseconsole_master_hostname => master,
+
+          :q_puppet_enterpriseconsole_auth_user_email => dashboard_user,
+          :q_puppet_enterpriseconsole_auth_password => "'#{dashboard_password}'",
+
+          :q_puppet_enterpriseconsole_httpd_port => 443,
+
+          :q_puppet_enterpriseconsole_smtp_host => smtp_host,
+          :q_puppet_enterpriseconsole_smtp_use_tls => smtp_use_tls,
+          :q_puppet_enterpriseconsole_smtp_port => smtp_port,
+        }
+
+        console_a[:q_puppet_enterpriseconsole_auth_user] = console_a[:q_puppet_enterpriseconsole_auth_user_email]
+
+        if smtp_password and smtp_username
+          console_a.merge!({
+                             :q_puppet_enterpriseconsole_smtp_password => "'#{smtp_password}'",
+                             :q_puppet_enterpriseconsole_smtp_username => "'#{smtp_username}'",
+                             :q_puppet_enterpriseconsole_smtp_user_auth => 'y'
+                           })
+        end
+
+        answers = agent_a.dup
+        if host == master
+          answers.merge! master_a
+        end
+
+        if host == dashboard
+          answers.merge! console_a
+        end
+
+        return answers
+      end
+
+      # Return answer data for all hosts.
+      #
+      # @param [Array<Beaker::Host>] hosts An array of host objects.
+      # @param [String] master_certname Hostname of the puppet master.
+      # @param [Hash] options options for answer files
+      # @option options [Symbol] :type Should be one of :upgrade or :install.
+      # @return [Hash] A hash (keyed from hosts) containing hashes of answer file
+      #   data.
+      def self.answers(hosts, master_certname, options)
+        the_answers = {}
+        dashboard = only_host_with_role(hosts, 'dashboard')
+        master = only_host_with_role(hosts, 'master')
+        hosts.each do |h|
+          the_answers[h.name] = host_answers(h, master_certname, master, dashboard, options)
+        end
+        return the_answers
+      end
+    end
+  end
+end

data/lib/beaker/answers/version28.rb

@@ -1,7 +1,20 @@
 module Beaker
   module Answers
+    # This class provides answer file information for PE version 2.8
+    #
+    # @api private
     module Version28
 
+      # Return answer data for a host
+      #
+      # @param [Beaker::Host] host Host to return data for
+      # @param [String] master_certname Hostname of the puppet master.
+      # @param [Beaker::Host] master Host object representing the master
+      # @param [Beaker::Host] dashboard Host object representing the dashboard
+      # @param [Hash] options options for answer files
+      # @option options [Symbol] :type Should be one of :upgrade or :install.
+      # @return [Hash] A hash (keyed from hosts) containing hashes of answer file
+      #   data.
       def self.host_answers(host, master_certname, master, dashboard, options)
         return nil if host['platform'] =~ /windows/
 
@@ -89,6 +102,14 @@ module Beaker
         return answers
       end
 
+      # Return answer data for all hosts.
+      #
+      # @param [Array<Beaker::Host>] hosts An array of host objects.
+      # @param [String] master_certname Hostname of the puppet master.
+      # @param [Hash] options options for answer files
+      # @option options [Symbol] :type Should be one of :upgrade or :install.
+      # @return [Hash] A hash (keyed from hosts) containing hashes of answer file
+      #   data.
       def self.answers(hosts, master_certname, options)
         the_answers = {}
         dashboard = only_host_with_role(hosts, 'dashboard')

data/lib/beaker/answers/version30.rb

@@ -1,7 +1,19 @@
 module Beaker
   module Answers
+    # This class provides answer file information for PE version 3.x
+    #
+    # @api private
     module Version30
-
+      # Return answer data for a host
+      #
+      # @param [Beaker::Host] host Host to return data for
+      # @param [String] master_certname Hostname of the puppet master.
+      # @param [Beaker::Host] master Host object representing the master
+      # @param [Beaker::Host] dashboard Host object representing the dashboard
+      # @param [Hash] options options for answer files
+      # @option options [Symbol] :type Should be one of :upgrade or :install.
+      # @return [Hash] A hash (keyed from hosts) containing hashes of answer file
+      #   data.
       def self.host_answers(host, master_certname, master, database, dashboard, options)
         # Windows hosts don't have normal answers...
         return nil if host['platform'] =~ /windows/
@@ -13,7 +25,7 @@ module Beaker
           :q_verify_packages => ENV['q_verify_packages'] || 'y',
           :q_puppet_symlinks_install => 'y',
           :q_puppetagent_certname => host,
-          :q_puppetagent_server => master,
+          :q_puppetagent_server => master_certname,
 
           # Disable database, console, and master by default
           # This will be overridden by other blocks being merged in.
@@ -50,7 +62,7 @@ module Beaker
         }
 
         if master['ip']
-          master_a[:q_puppetmaster_dnsaltnames]+=","+master['ip']
+          master_a[:q_puppetmaster_dnsaltnames]+= "," + master['ip']
         end
 
         # Common answers for console and database
@@ -170,13 +182,21 @@ module Beaker
         return answers
       end
 
+      # Return answer data for all hosts.
+      #
+      # @param [Array<Beaker::Host>] hosts An array of host objects.
+      # @param [String] master_certname Hostname of the puppet master.
+      # @param [Hash] options options for answer files
+      # @option options [Symbol] :type Should be one of :upgrade or :install.
+      # @return [Hash] A hash (keyed from hosts) containing hashes of answer file
+      #   data.
       def self.answers(hosts, master_certname, options)
         the_answers = {}
         database = only_host_with_role(hosts, 'database')
         dashboard = only_host_with_role(hosts, 'dashboard')
         master = only_host_with_role(hosts, 'master')
         hosts.each do |h|
-          if options[:type] == :upgrade and options[:from] =~ /\A3.0/
+          if options[:type] == :upgrade and h[:pe_ver] =~ /\A3.0/
             # 3.0.x to 3.0.x should require no answers
             the_answers[h.name] = {
               :q_install => 'y',
@@ -188,7 +208,6 @@ module Beaker
         end
         return the_answers
       end
-
     end
   end
 end

data/lib/beaker/cli.rb

@@ -1,29 +1,16 @@
 module Beaker
   class CLI
     def initialize
-      @options = Beaker::Options.parse_args
+      @options_parser = Beaker::Options::Parser.new
+      @options = @options_parser.parse_args
       @logger = Beaker::Logger.new(@options)
       @options[:logger] = @logger
 
-      if not @options[:config] 
-        report_and_raise(@logger, RuntimeError.new("Argh!  There is no default for Config, specify one (-c or --config)!"), "CLI: initialize") 
+      if @options[:help]
+        @logger.notify(@options_parser.usage)
+        exit
       end
-
-      @logger.debug("Options")
-      @options.each do |opt, val|
-        if val and val != [] 
-          @logger.debug("\t#{opt.to_s}:")
-          if val.kind_of?(Array)
-            val.each do |v|
-              @logger.debug("\t\t#{v.to_s}")
-            end
-          else
-            @logger.debug("\t\t#{val.to_s}")
-          end
-        end
-      end
-
-      @config = Beaker::TestConfig.new(@options[:config], @options)
+      @logger.notify(@options.dump)
 
       #add additional paths to the LOAD_PATH
       if not @options[:load_path].empty?
@@ -34,31 +21,37 @@ module Beaker
       @options[:helper].each do |helper|
         require File.expand_path(helper)
       end
+    end
 
-      @hosts =  []
-      @network_manager = Beaker::NetworkManager.new(@config, @options, @logger)
-      @hosts = @network_manager.provision
-      #validate that the hosts are correctly configured
-      Beaker::Utils::Validator.validate(@hosts, @logger)
+    def provision
+      begin
+        @hosts =  []
+        @network_manager = Beaker::NetworkManager.new(@options, @logger)
+        @hosts = @network_manager.provision
+      rescue => e
+        report_and_raise(@logger, e, "CLI.provision")
+      end
+    end
 
+    def validate
+      begin
+        #validation phase
+        Beaker::Utils::Validator.validate(@hosts, @logger)
+      rescue => e
+        report_and_raise(@logger, e, "CLI.validate")
+      end
     end
 
-    def execute!
+    def setup
       @ntp_controller = Beaker::Utils::NTPControl.new(@options, @hosts)
       @setup = Beaker::Utils::SetupHelper.new(@options, @hosts)
       @repo_controller = Beaker::Utils::RepoControl.new(@options, @hosts)
-
       setup_steps = [[:timesync, "Sync time on hosts", Proc.new {@ntp_controller.timesync}],
                      [:root_keys, "Sync keys to hosts" , Proc.new {@setup.sync_root_keys}],
                      [:repo_proxy, "Proxy packaging repositories on ubuntu, debian and solaris-11", Proc.new {@repo_controller.proxy_config}],
                      [:add_el_extras, "Add Extra Packages for Enterprise Linux (EPEL) repository to el-* hosts", Proc.new {@repo_controller.add_el_extras}],
                      [:add_master_entry, "Update /etc/hosts on master with master's ip", Proc.new {@setup.add_master_entry}]]
-      
       begin
-        trap(:INT) do
-          @logger.warn "Interrupt received; exiting..."
-          exit(1)
-        end
         #setup phase
         setup_steps.each do |step| 
           if (not @options.has_key?(step[0])) or @options[step[0]]
@@ -67,21 +60,38 @@ module Beaker
             step[2].call
           end
         end
+      rescue => e
+        report_and_raise(@logger, e, "CLI.setup")
+      end
+    end
+
+    def execute!
+
+      begin
+        trap(:INT) do
+          @logger.warn "Interrupt received; exiting..."
+          exit(1)
+        end
+
+        provision
+        validate
+        setup
 
         #pre acceptance  phase
-        run_suite('pre-suite', @options.merge({:tests => @options[:pre_suite]}), :fail_fast)
+        run_suite(:pre_suite, :fail_fast)
+
         #testing phase
         begin
-          run_suite('acceptance', @options)
+          run_suite(:tests)
         #post acceptance phase
         rescue => e
           #post acceptance on failure
           #if we error then run the post suite as long as we aren't in fail-stop mode
-          run_suite('post-suite', @options.merge({:tests => @options[:post_suite]})) unless @options[:fail_mode] == "stop"
+          run_suite(:post_suite) unless @options[:fail_mode] == "stop"
           raise e
         else
           #post acceptance on success
-          run_suite('post-suite', @options.merge({:tests => @options[:post_suite]}))
+          run_suite(:post_suite)
         end
       #cleanup phase
       rescue => e
@@ -89,23 +99,27 @@ module Beaker
         #only do cleanup if we aren't in fail-stop mode
         @logger.notify "Cleanup: cleaning up after failed run"
         if @options[:fail_mode] != "stop"
-          @network_manager.cleanup
+          if @network_manager
+            @network_manager.cleanup
+          end
         end
         raise "Failed to execute tests!"
       else
         #cleanup on success
         @logger.notify "Cleanup: cleaning up after successful run"
-        @network_manager.cleanup
+        if @network_manager
+          @network_manager.cleanup
+        end
       end
     end
 
-    def run_suite(name, options, failure_strategy = false)
-      if (options[:tests].empty?)
-        @logger.notify("No tests to run for suite '#{name}'")
+    def run_suite(suite_name, failure_strategy = false)
+      if (@options[suite_name].empty?)
+        @logger.notify("No tests to run for suite '#{suite_name.to_s}'")
         return
       end
       Beaker::TestSuite.new(
-        name, @hosts, options, @config, failure_strategy
+        suite_name, @hosts, @options, failure_strategy
       ).run_and_raise_on_failure
     end