beaker 1.0.1 → 1.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTM0OWZkNGIzNmYyNDhhMjI4Zjk1ODE4M2I5OGZiMTIyMTJlYmJlNg==
+    YzczNTY1ZTQ2MDkwOWE2YzhhNDhmMjVlNGVkZGQ0YmY4MTcwYjk2NA==
   data.tar.gz: !binary |-
-    MGM1MWNkMDNiMWE1ZWNiNTMzNjE2MTg1MDNjYWRjNzRiMDQ2ZmRjZg==
+    ZmEwZWVjOGUwZGMyZjJmMGVjZWMxMWRjYmJkY2ZlYmU4Njc4MDMzYw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NWVkM2ExMzE4MjQzOWQ3MDViZThkMjUzNmFhOWRlMmQ0MTljNzNmY2JlMTkw
-    MWQ2NjQxNGUyMmUwYmZiNGQ0MzhmYTdjMzA1ODg2ZGQ4OThiOGVmOTMwZGEx
-    ZjAyM2E2NjhiODJhZDYyOTI1MjMxMzc0NjhlYjNkYWMxYmRiNmQ=
+    YWVmNmJjZGFlOTFkN2RiM2FiNjBiZDZlZThmMThkNDQ0NzY3YjE1OTYxMmY1
+    Zjg2NTk2NDA3NzkyYjYyNTU4ZDVlYWI5MDBiMWVjMjEyM2E2ZWViNTk0Zjg0
+    M2ZiNmVkMzYwNWQ5MDRkNzY2ZGE3YjQ5ZDY1ZDI0YjFkMjdjMzU=
   data.tar.gz: !binary |-
-    OGJlNjgxYzk0ZmE1NTQ0MjIxZDVkMDhiMmRlN2ExMTc1ZGYwZDVmODU4MThk
-    MTA4MjRkNzFlYjIzNzhmMjhlMTNhMmExMzAxYWFjYzg0NWJkZmI5YmJiZTY3
-    YjMxYmI3ZWVkOTM2ZjY3Y2JjYmU4ODViYTJmODA2NGVhZTkxZDY=
+    YzdlM2U2Njk1MjAxYTg5MmMyNWU0Mzg0NGI5OWI2ZTMwMDgyODQwZGM4NDY2
+    MWYyY2E0ZDU2ZWQ5MjQwYWMzMzEzY2ViNjllNmQzMTI2YzAwNzFlZDQ0NDE3
+    OTJmN2E0NjBhOTczNjc5MGY5ZjkwNTMyZDRkMmNiMDVlY2ZlYzA=

data/README.md

@@ -82,6 +82,51 @@ In this case, the host 'ubuntu-1004-32' is now the Puppet Master, while 'ubuntu-
 Puppet Dashboard host, resulting in a split Master/Dashboard install.  Systest will automagically 
 prepare an appropriate answers file for use with the PE Installer.
 
+## Required Host Settings ##
+To properly define a host you must provide:
+
+* name
+  * The string identifying this host
+* platform
+  * One of the Beaker supported platforms
+
+## Optional Host Settings ##
+Additionaly, Beaker supports the following host options:
+
+* ip
+  * the IP address of the SUT
+* hypervisor
+  * one of `solaris`, `blimpy`, `vsphere`, `fusion`, `aix`, `vcloud` or `vagrant`
+  * additional settings may be required depending on the selected hypervisor (ie, template, box, box_url, etc).  Check the documentation below for your hypervisor for details  
+* snapshot
+  * the name of the snapshot to revert to before testing
+* roles
+  * the 'job' of this host, an array of `master`, `agent`, `dashboard`, `database`, `default` or any user-defined string
+* pe_dir
+  * the directory where PE builds are located, may be local directory or a URL
+* pe_ver
+  * the version number of PE to install
+
+
+## Supported Platforms ##
+Beaker depends upon each host in the configuration file having a platform type that is correctly formatted and supported.  The platform is used to determine how various operations are carried out internally (such as installing packages using the correct package manager for the given operating system).
+
+The platform's format is `/^OSFAMILY-VERSION-ARCH.*$/` where `OSFAMILY` is one of:
+
+* centos
+* fedora
+* debian
+* oracle
+* redhat
+* scientific
+* sles
+* ubuntu
+* windows
+* solaris
+* aix
+* el
+
+`VERSION`'s format is not enforced, but should reflect the `OSFAMILY` selected (ie, ubuntu-1204-i386-master, scientific-6-i386-agent, etc).  `ARCH`'s format is also not enforced, but should be appropriate to the `OSFAMILY` selected (ie, ubuntu-1204-i386-master, sles-11-x86_64-master, debian-7-amd64-master, etc).
 
 # Provisioning #
 Systest has built in capabilites for managing VMs and provisioning SUTs:
@@ -251,6 +296,14 @@ The vm is identified by `box` or `box_url` in the config file.  No snapshot name
       nfs_server: none
       consoleport: 443
 
+VagrantFiles are created per host configuration file.  They can be found in the `.vagrant/beaker_vagrant_files` directory of the current working directory in a subdirectory named after the host configuration file.
+
+    > beaker --hosts sample.cfg
+    > cd .vagrant/beaker_vagrant_files; ls
+    sample.cfg
+    > cd sample.cfg; ls
+    VagrantFile
+
 # Putting it all together #
 
 ## Running FOSS tests ##

data/beaker.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "beaker"
-  s.version     = '1.0.1'
+  s.version     = '1.1.0'
   s.authors     = ["Puppetlabs"]
   s.email       = ["delivery@puppetlabs.com"]
   s.homepage    = "https://github.com/puppetlabs/beaker"

data/lib/beaker/dsl/helpers.rb

@@ -212,6 +212,35 @@ module Beaker
         host.install_package package_name
       end
 
+      # Upgrade a package on a host. The package must already be installed
+      #
+      # @param [Host] host             A host object
+      # @param [String] package_name   Name of the package to install
+      #
+      # @return [Result]   An object representing the outcome of *upgrade command*.
+      def upgrade_package host, package_name
+        host.upgrade_package package_name
+      end
+
+      # Deploy packaging configurations generated by
+      # https://github.com/puppetlabs/packaging to a host.
+      #
+      # @note To ensure the repo configs are available for deployment,
+      #       you should run `rake pl:jenkins:deb_repo_configs` and
+      #       `rake pl:jenkins:rpm_repo_configs` on your project checkout
+      #
+      # @param [Host] host
+      # @param [String] path     The path to the generated repository config
+      #                          files. ex: /myproject/pkg/repo_configs
+      # @param [String] name     A human-readable name for the repository
+      # @param [String[ version  The version of the project, as used by the
+      #                          packaging tools. This can be determined with
+      #                          `rake pl:print_build_params` from the packaging
+      #                          repo.
+      def deploy_package_repo host, path, name, version
+        host.deploy_package_repo path, name, version
+      end
+
       # Create a remote file out of a string
       # @note This method uses Tempfile in Ruby's STDLIB as well as {#scp_to}.
       #

data/lib/beaker/host.rb

@@ -51,6 +51,12 @@ module Beaker
       # configurations we have for many of our products
       type = is_pe? ? :pe : :foss
       @defaults = merge_defaults_for_type @options, type
+      pkg_initialize
+    end
+
+    def pkg_initialize
+      # This method should be overridden by platform-specific code to
+      # handle whatever packaging-related initialization is necessary.
     end
 
     def merge_defaults_for_type options, type

data/lib/beaker/host/unix/pkg.rb

@@ -1,6 +1,12 @@
 module Unix::Pkg
   include Beaker::CommandFactory
 
+  # This method overrides {Host::pkg_initialize} to provide
+  # unix-specific package management setup
+  def pkg_initialize
+    @apt_needs_update = true
+  end
+
   def check_for_package(name)
     result = exec(Beaker::Command.new("which #{name}"), :acceptable_exit_codes => (0...127))
     case self['platform']
@@ -11,6 +17,17 @@ module Unix::Pkg
     end
   end
 
+  # If apt has not been updated since the last repo deployment it is
+  # updated. Otherwise this is a noop
+  def update_apt_if_needed
+    if self['platform'] =~ /debian|ubuntu/
+      if @apt_needs_update
+        execute("apt-get update")
+        @apt_needs_update = false
+      end
+    end
+  end
+
   def install_package(name, cmdline_args = '')
     case self['platform']
       when /sles-/
@@ -20,7 +37,7 @@ module Unix::Pkg
       when /fedora|centos|el-/
         execute("yum -y #{cmdline_args} install #{name}")
       when /ubuntu|debian/
-        execute("apt-get update")
+        update_apt_if_needed
         execute("apt-get install #{cmdline_args} -y #{name}")
       when /solaris-11/
         execute("pkg #{cmdline_args} install #{name}")
@@ -49,4 +66,111 @@ module Unix::Pkg
         raise "Package #{name} cannot be installed on #{self}"
     end
   end
+
+  # Upgrade an installed package to the latest available version
+  #
+  # @param [String] name          The name of the package to update
+  # @param [String] cmdline_args  Additional command line arguments for
+  #                               the package manager
+  def upgrade_package(name, cmdline_args = '')
+    case self['platform']
+      when /sles-/
+        execute("zypper --non-interactive --no-gpg-checks up #{name}")
+      when /el-4/
+        @logger.debug("Package upgrade is not supported on rhel4")
+      when /fedora|centos|el-/
+        execute("yum -y #{cmdline_args} update #{name}")
+      when /ubuntu|debian/
+        update_apt_if_needed
+        execute("apt-get install -o Dpkg::Options::='--force-confold' #{cmdline_args} -y --force-yes #{name}")
+      when /solaris-11/
+        execute("pkg #{cmdline_args} update #{name}")
+      when /solaris-10/
+        execute("pkgutil -u -y #{cmdline_args} ${name}")
+      else
+        raise "Package #{name} cannot be upgraded on #{self}"
+    end
+  end
+
+  # Debian repositories contain packages for all architectures, so we
+  # need to map to an architecturless name for each platform
+  DEBIAN_PLATFORM_CODENAMES = {
+    'debian-6-amd64'     => 'squeeze',
+    'debian-6-i386'      => 'squeeze',
+    'debian-7-amd64'     => 'wheezy',
+    'debian-7-i386'      => 'wheezy',
+    'ubuntu-10.04-amd64' => 'lucid',
+    'ubuntu-10.04-i386'  => 'lucid',
+    'ubuntu-12.04-amd64' => 'precise',
+    'ubuntu-12.04-i386'  => 'precise',
+  }
+
+  # Deploy apt configuration generated by the packaging tooling
+  #
+  # @note Due to the debian use of codenames in repos, the
+  #       DEBIAN_PLATFORM_CODENAMES map must be kept up-to-date as
+  #       support for new versions is added.
+  #
+  # @note See {Beaker::DSL::Helpers::deploy_package_repo} for info on
+  #       params
+  def deploy_apt_repo(path, name, version)
+    codename = DEBIAN_PLATFORM_CODENAMES[self['platform']]
+    if codename.nil?
+      @logger.warning "Could not determine codename for debian platform #{self['platform']}. Skipping deployment of repo #{name}"
+      return
+    end
+
+    repo_file = "#{path}/deb/pl-#{name}-#{version}-#{codename}.list"
+    do_scp_to repo_file, "/etc/apt/sources.list.d/#{name}.list", {}
+    @apt_needs_update = true
+  end
+
+  # Deploy yum configuration generated by the packaging tooling
+  #
+  # @note See {Beaker::DSL::Helpers::deploy_package_repo} for info on
+  #       params
+  def deploy_yum_repo(path, name, version)
+    repo_file = "#{path}/rpm/pl-#{name}-#{version}-repos-pe-#{self['platform']}.repo"
+    do_scp_to repo_file, "/etc/yum.repos.d/#{name}.repo", {}
+  end
+
+  # Deploy zypper repo configuration generated by the packaging tooling
+  #
+  # @note See {Beaker::DSL::Helpers::deploy_package_repo} for info on
+  #       params
+  def deploy_zyp_repo(path, name, version)
+    repo_file = "#{path}/rpm/pl-#{name}-#{version}-repos-pe-#{self['platform']}.repo"
+    repo = IniFile.load(repo_file)
+    repo_name = repo.sections[0]
+    repo_url = repo[repo_name]["baseurl"]
+    execute("zypper ar -t YUM #{repo_url} #{repo_name}")
+  end
+
+  # Deploy configuration generated by the packaging tooling to this host.
+  #
+  # This method calls one of {deploy_apt_repo}, {deploy_yum_repo}, or
+  # {deploy_zyp_repo} depending on the platform of this Host.
+  #
+  # @note See {Beaker::DSL::Helpers::deploy_package_repo} for info on
+  #       params
+  def deploy_package_repo(path, name, version)
+    if not File.exists? path
+      @logger.warning "Was asked to deploy package repository from #{path}, but it doesn't exist!"
+      return
+    end
+
+    case self['platform']
+      when /el-4/
+        @logger.debug("Package repo deploy is not supported on rhel4")
+      when /fedora|centos|el-/
+        deploy_yum_repo(path, name, version)
+      when /ubuntu|debian/
+        deploy_apt_repo(path, name, version)
+      when /sles/
+        deploy_zyp_repo(path, name, version)
+      else
+        # solaris, windows
+        raise "Package repo cannot be deployed on #{self}; the platform is not supported"
+    end
+  end
 end

data/lib/beaker/hypervisor/blimper.rb

@@ -59,17 +59,17 @@ module Beaker
         end
       end
 
-      # Attempt to start the fleet, we wrap it with some error handling that deals
-      # with generic Fog errors and retrying in case these errors are transient.
+      # Attempt to start the fleet, we wrap it with some error handling that
+      # deals with generic Fog errors and retrying in case these errors are
+      # transient.
       fleet_retries = 0
       begin
         fleet.start
-      rescue Fog::Errors::Error => ex
+      rescue Fog::Errors::Error, SystemCallError => ex
         fleet_retries += 1
         if fleet_retries <= 3
           sleep_time = rand(10) + 10
-          @logger.notify("Calling fleet.destroy, sleeping #{sleep_time} seconds and retrying fleet.start due to Fog::Errors::Error (#{
-  ex.message}), retry attempt #{fleet_retries}.")
+          @logger.notify("Calling fleet.destroy, sleeping #{sleep_time} seconds and retrying fleet.start due to exception #{ex.class.to_s} (#{ex.message}), retry attempt #{fleet_retries}.")
           begin
             timeout(30) do
               fleet.destroy

data/lib/beaker/hypervisor/vagrant.rb

@@ -88,7 +88,7 @@ module Beaker
       @logger = options[:logger]
       @temp_files = []
       @vagrant_hosts = vagrant_hosts
-      @vagrant_path = File.expand_path(File.join(File.basename(__FILE__), '..', 'vagrant_files', File.basename(options[:hosts_file])))
+      @vagrant_path = File.expand_path(File.join(File.basename(__FILE__), '..', '.vagrant', 'beaker_vagrant_files', File.basename(options[:hosts_file])))
       FileUtils.mkdir_p(@vagrant_path)
       @vagrant_file = File.expand_path(File.join(@vagrant_path, "Vagrantfile"))
 

data/lib/beaker/options/parser.rb

@@ -11,6 +11,8 @@ module Beaker
       #These options expand out into an array of .rb files
       RB_FILE_OPTS = [:tests, :pre_suite, :post_suite]
 
+      PLATFORMS = /^(centos|fedora|debian|oracle|redhat|scientific|sles|ubuntu|windows|solaris|aix|el)\-.+\-.+$/
+
       PARSE_ERROR = if RUBY_VERSION > '1.8.7'; then Psych::SyntaxError; else ArgumentError; end
 
       #The OptionsHash of all parsed options
@@ -186,6 +188,7 @@ module Beaker
       #Validate all merged options values for correctness
       #
       #Currently checks:
+      #  - each host has a valid platform
       #  - if a keyfile is provided then use it
       #  - paths provided to --test, --pre-suite, --post-suite provided lists of .rb files for testing
       #  - --type is one of 'pe' or 'git'
@@ -199,6 +202,16 @@ module Beaker
       #@raise [ArgumentError] Raise if argument/options values are invalid
       def normalize_args
 
+        @options['HOSTS'].each_key do |name|
+          if not @options['HOSTS'][name]['platform']
+            parser_error "Host #{name} does not have a platform specified"
+          else
+            if not @options['HOSTS'][name]['platform'] =~ PLATFORMS
+              parser_error "Host #{name} is on unsupported platform #{@options['HOSTS'][name]['platform']}"
+            end
+          end
+        end
+
         #use the keyfile if present
         if @options.has_key?(:keyfile)
           @options[:ssh][:keys] = [@options[:keyfile]]

data/spec/beaker/hypervisor/vagrant_spec.rb

@@ -8,6 +8,16 @@ module Beaker
       @hosts = make_hosts()
     end
 
+    it "stores the vagrant file in $WORKINGDIR/.vagrant/beaker_vagrant_files/sample.cfg" do
+      FakeFS.activate!
+      vagrant.stub( :randmac ).and_return( "0123456789" )
+      path = vagrant.instance_variable_get( :@vagrant_path )
+
+      expect( path ).to be === File.join(Dir.pwd, '.vagrant', 'beaker_vagrant_files', 'sample.cfg')
+
+    end
+
+
     it "can make a Vagranfile for a set of hosts" do
       FakeFS.activate!
       path = vagrant.instance_variable_get( :@vagrant_path )

data/spec/beaker/options/parser_spec.rb

@@ -4,11 +4,12 @@ module Beaker
   module Options
 
     describe Parser do
-      let(:parser)    { Parser.new }
-      let(:opts_path) { File.join(File.expand_path(File.dirname(__FILE__)), "data", "opts.txt") }
-      let(:hosts_path)  { File.join(File.expand_path(File.dirname(__FILE__)), "data", "hosts.cfg") }
-      let(:badyaml_path)  { File.join(File.expand_path(File.dirname(__FILE__)), "data", "badyaml.cfg") }
-      let(:home) {ENV['HOME']}
+      let(:parser)           { Parser.new }
+      let(:opts_path)        { File.join(File.expand_path(File.dirname(__FILE__)), "data", "opts.txt") }
+      let(:hosts_path)       { File.join(File.expand_path(File.dirname(__FILE__)), "data", "hosts.cfg") }
+      let(:badyaml_path)     { File.join(File.expand_path(File.dirname(__FILE__)), "data", "badyaml.cfg") }
+      let(:home)             { ENV['HOME'] }
+      let(:platforms_regex)  { Parser::PLATFORMS }
 
       it "supports usage function" do
         expect{parser.usage}.to_not raise_error
@@ -20,6 +21,26 @@ module Beaker
         expect(parser.repo).to be === "#{repo}"
       end
 
+      #read through the file of possible platform values, correctly identify the 50 invalid platform values
+      describe "recognizes valid platforms" do
+
+        it "accepts correctly formatted platform values" do
+          expect( 'oracle-version-arch' =~ platforms_regex ).to be === 0
+        end
+
+        it "rejects non-supported osfamilies" do
+          expect( 'amazon6-version-arch' =~ platforms_regex ).to be === nil
+        end
+
+        it "rejects platforms without version/arch" do
+          expect( 'ubuntu-5' =~ platforms_regex ).to be === nil
+        end
+
+        it "rejects platforms that do not have osfamily at start of string" do
+          expect( 'oel-r5-u6-x86-64' =~ platforms_regex ).to be === nil
+        end
+      end
+
       #test parse_install_options
       it "can transform --install PUPPET/3.1 into #{repo}/puppet.git#3.1" do
         opts = ["PUPPET/3.1"]
@@ -148,17 +169,17 @@ module Beaker
         end
 
         context "for pe" do
-          it_should_behave_like(:a_platform_supporting_only_agents, 'solaris', 'pe')
-          it_should_behave_like(:a_platform_supporting_only_agents, 'windows', 'pe')
-          it_should_behave_like(:a_platform_supporting_only_agents, 'el-4', 'pe')
+          it_should_behave_like(:a_platform_supporting_only_agents, 'solaris-version-arch', 'pe')
+          it_should_behave_like(:a_platform_supporting_only_agents, 'windows-version-arch', 'pe')
+          it_should_behave_like(:a_platform_supporting_only_agents, 'el-4-arch', 'pe')
         end
 
         context "for foss" do
-          it_should_behave_like(:a_platform_supporting_only_agents, 'windows', 'git')
-          it_should_behave_like(:a_platform_supporting_only_agents, 'el-4', 'git')
+          it_should_behave_like(:a_platform_supporting_only_agents, 'windows-version-arch', 'git')
+          it_should_behave_like(:a_platform_supporting_only_agents, 'el-4-arch', 'git')
 
           it "allows master role for solaris" do
-            hosts_file = fake_hosts_file_for_platform(hosts, 'solaris')
+            hosts_file = fake_hosts_file_for_platform(hosts, 'solaris-version-arch')
             args = ["--type", "git", "--hosts", hosts_file]
             options_hash = parser.parse_args(args)
             expect(options_hash[:HOSTS][:master][:platform]).to match(/solaris/)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec