beaker 2.9.0 → 2.10.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTRiYTFlN2E4ZTQyNWUxMWJlZGRmNzNmNTNmN2NhYzk3OTFjODYzYg==
+    YmY2Mjc5OTAyMTE2ODI4ZWNkMGYwMTkyMjE2NDVjNTRmM2FiYzA5Nw==
   data.tar.gz: !binary |-
-    YjNkMGZkODlhYmM3Y2Q2ZDA5OGE1OTM2ODQ2MWIxNzkxYmViMDY3ZQ==
+    MzMyODZhZDIwMzJkNzYwZjdlYmVjNTNlODdjODg5NmJjNjdkNGJiNQ==
 SHA512:
   metadata.gz: !binary |-
-    ZDkyODM0NzY1ZGY0MzdiNzViMzEyZTZhMmRiNTAyNTAzMDQzMmU3Y2IwNTM3
-    YmQ5OWViYzYzNDUzYWE5OTlmNGNkZjljNzgwMmE4MmQwODZhNTE3ZTQ4MjZl
-    ODE3Mzg1MmMxOTFjMmRhMWM5ZmFmNGRjOWExNWU1MGFhYjQ5MjM=
+    ZjRmYmIzOGJmMzE2YWNiYjVmMWUzMGQyYjgwNTg3NzU0NDdmNGQ4ZDhiNThl
+    MmE2NmU3MWU3OWRhMGYwZjQ0ZDQ2ZTc2M2U1NGVjNDJhNDZhYTI4MzkzOWEz
+    N2JiNmVhNjRiYmJmM2U2NzM1Mjg0NDA5ZTg2MGFjYTA4NGM5ZmI=
   data.tar.gz: !binary |-
-    MDEzZjUxNmZmMmI1MjdiZjcwZjFjNDY3ODA2MDdlYmY3MTQwNGMxZWNjNjcy
-    MmM4NzZhMjcxMDljNWE4NDU4MGE3MmQ2MGQxYWFhOWNjMzYzZTk2M2Y2MmU5
-    MThkNWE5MTQzYjRmNDg3MWU3MzQyZjA4MjVlYzZhZDZhZDFkZWE=
+    YTk0ZThhMGRkYzEwMWRjNjdkNTBkZmE3NzI0Y2E3YjcyOWI5NmYwOTExYjg4
+    MDA1MzY5YzE4NDVjMWE5N2MzYTczZjdhMjRlOWQwZGUzMGUxZmJhNWM4N2E2
+    YTU2YjFmN2JiNmZlMjgyNmRiYzMyYWE3ZDZiNzJlMjY0MTQ1NDg=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 9 Apr, 2015 (901c4a94)](#LATEST)
+* [LATEST - 22 Apr, 2015 (2f834676)](#LATEST)
+* [2.9.0 - 9 Apr, 2015 (b161d325)](#2.9.0)
 * [beaker2.8.0 - 26 Mar, 2015 (2d25d06d)](#beaker2.8.0)
 * [beaker2.7.1 - 19 Mar, 2015 (45b2bf10)](#beaker2.7.1)
 * [beaker2.7.0 - 19 Mar, 2015 (38b14ef8)](#beaker2.7.0)
@@ -77,7 +78,195 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 9 Apr, 2015 (901c4a94)
+### <a name = "LATEST">LATEST - 22 Apr, 2015 (2f834676)
+
+* (GEM) update beaker version to 2.10.0 (2f834676)
+
+* Merge pull request #777 from kevpl/bkr184_repos_addoption (c68967e3)
+
+
+```
+Merge pull request #777 from kevpl/bkr184_repos_addoption
+
+(BKR-184) generalized repo selection code for install_puppetlabs_dev_repo
+```
+* Merge pull request #775 from kevpl/bkr4_hostsfile_reuse (433d7ccd)
+
+
+```
+Merge pull request #775 from kevpl/bkr4_hostsfile_reuse
+
+(BKR-4) Beaker now dumps re-usable hosts file when SUTs are preserved
+```
+* Merge pull request #787 from er0ck/fix/master/BKR-209-check_for_package_and_host_prebuild_sles10 (c256ebd7)
+
+
+```
+Merge pull request #787 from er0ck/fix/master/BKR-209-check_for_package_and_host_prebuild_sles10
+
+(BKR-209) check for package and host prebuild sles10
+```
+* (BKR-209) check for package and host prebuild sles10 (f21ad513)
+
+
+```
+(BKR-209) check for package and host prebuild sles10
+
+this change fixes check_for_package on sles10 in which zypper always
+returns 0, even if a package is not found.
+This change also removes ntp package from the host pre-build steps.
+sles10 comes with ntp_command installed.
+```
+* Merge pull request #785 from anodelman/cherry (8eb9a543)
+
+
+```
+Merge pull request #785 from anodelman/cherry
+
+(BKR-196) add 'reboot' host method
+```
+* (BKR-196) add 'reboot' host method (53cd051b)
+
+
+```
+(BKR-196) add 'reboot' host method
+
+- added host.reboot method
+- added acceptance test to ensure functionality
+```
+* Merge pull request #733 from fiddyspence/feature/better_openstack_ip_assignment_handling (d854fcae)
+
+
+```
+Merge pull request #733 from fiddyspence/feature/better_openstack_ip_assignment_handling
+
+(gh-732) Better Openstack IP address assignment
+```
+* Merge pull request #752 from petems/MAINT-fix_install_puppet_from_msi_on_cygwin (1333f9bd)
+
+
+```
+Merge pull request #752 from petems/MAINT-fix_install_puppet_from_msi_on_cygwin
+
+(MAINT) Fix install_puppet_from msi_on non-cygwin
+```
+* Merge pull request #765 from petems/BKR-113-add_freesbd_vagrant_options (6bec19f7)
+
+
+```
+Merge pull request #765 from petems/BKR-113-add_freesbd_vagrant_options
+
+(BKR-113) Adds FreeBSD Vagrantfile logic
+```
+* Merge pull request #766 from petems/BKR-113-host_prebuild_steps_for_freebsd (59873206)
+
+
+```
+Merge pull request #766 from petems/BKR-113-host_prebuild_steps_for_freebsd
+
+(BKR-113) Host Prebuilt commands for FreeBSD
+```
+* Merge pull request #774 from electrical/centos7 (00434a4f)
+
+
+```
+Merge pull request #774 from electrical/centos7
+
+modifications for CentOS-7
+```
+* Merge pull request #779 from kevpl/bkr150_sut_changename (85e45d64)
+
+
+```
+Merge pull request #779 from kevpl/bkr150_sut_changename
+
+(BKR-150) changed host name to host.log_prefix for extra context in sut.log
+```
+* Merge pull request #683 from fiddyspence/bug/openstack_multi_host_blurn (57e398a5)
+
+
+```
+Merge pull request #683 from fiddyspence/bug/openstack_multi_host_blurn
+
+(gh-687) [openstack] multi node root user enable
+```
+* Merge pull request #784 from anodelman/answers (35632798)
+
+
+```
+Merge pull request #784 from anodelman/answers
+
+(BKR-182) Disable check_for_updates by default with beaker
+```
+* (BKR-182) Disable check_for_updates by default with beaker (75384994)
+
+
+```
+(BKR-182) Disable check_for_updates by default with beaker
+
+- added to version 3.2+
+```
+* (BKR-150) changed host name to host.log_prefix for extra context in sut.log (7ec8d8e8)
+
+* (BKR-184) generalized repo selection code for install_puppetlabs_dev_repo (b3b519ea)
+
+* (BKR-4) Beaker now dumps re-usable hosts file when SUTs are preserved (03f7262f)
+
+* (BKR-116) modifications for CentOS-7 (1d961ccc)
+
+* (BKR-113) Host Prebuilt commands for FreeBSD (39038ad3)
+
+
+```
+(BKR-113) Host Prebuilt commands for FreeBSD
+
+Since FreeBSD echo is different from Linux-y echo, it's much easier to just use printf and escape the strings using gsub.
+```
+* (BKR-113) Adds FreeBSD Vagrantfile logic (95429ad7)
+
+
+```
+(BKR-113) Adds FreeBSD Vagrantfile logic
+
+With Vagrant we use rsync for folder sync, as nfs has a character restriction of 88 characters. So depending on the module name and where it's being stored, it can error out:
+
+
+
+==> default: Mounting NFS shared folders...
+The following SSH command responded with a non-zero exit status.
+Vagrant assumes that this means the command failed!
+
+mount -t nfs '10.0.1.1:/Users/petersouter/projects/reallylongpathnameover88characterssothatmountfswillfail12345678910111213141516' '/vagrant'
+
+Stdout from the command:
+
+Stderr from the command:
+
+mount_nfs: 10.0.1.1:/Users/petersouter/projects/reallylongpathnameover88characterssothatmountfswillfail12345678910111213141516: File name too long
+
+
+
+Further reading if interested:
+http://www.secnetix.de/olli/FreeBSD/mnamelen.hawk
+https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=167105
+```
+* (MAINT) Changes msi install commands run when on non-cygwin (89dabc69)
+
+* (MAINT) Changes msi install commands ran... (effcde41)
+
+
+```
+(MAINT) Changes msi install commands ran...
+
+When on non-cygwin Windows, use `start` not cmd
+```
+* (gh-732) Better Openstack IP address assignment (e1fcd580)
+
+* (gh-687) [openstack] Previously, the method attemped to set root on all nodes, even if the node was not up yet (802db0e9)
+
+### <a name = "2.9.0">2.9.0 - 9 Apr, 2015 (b161d325)
+
+* (HISTORY) update beaker history for gem release 2.9.0 (b161d325)
 
 * (GEM) update beaker version to 2.9.0 (901c4a94)
 

data/acceptance/tests/base/host.rb

@@ -152,3 +152,9 @@ hosts.each do |host|
     assert_equal(0, host_paths.length, "there are extra paths on #{host} (#{host_paths})")
   end
 end
+
+step "#reboot: can reboot the host"
+hosts.each do |host|
+  host.reboot
+  on host, "echo #{host} rebooted!"
+end

data/lib/beaker/answers/version32.rb

@@ -23,6 +23,11 @@ module Beaker
         the_answers[dashboard.name][:q_puppetmaster_certname] = master
       end
 
+      # do we want to check for updates?
+      pe_check_for_updates = answer_for(@options, :q_pe_check_for_updates, 'n')
+      the_answers[dashboard.name][:q_pe_check_for_updates] = pe_check_for_updates
+      the_answers[master.name][:q_pe_check_for_updates] = pe_check_for_updates
+
       if @options[:type] == :upgrade && dashboard != database
         # In a split configuration, there is no way for the upgrader
         # to know how much disk space is available for the database

data/lib/beaker/cli.rb

@@ -126,6 +126,8 @@ module Beaker
           if @network_manager
             @network_manager.cleanup
           end
+        else
+          preserve_hosts_file if @options[:provision]
         end
 
         if @logger.is_debug?
@@ -149,7 +151,38 @@ module Beaker
       ).run_and_raise_on_failure
     end
 
-    # @see print_env_vars_affecting_beaker & print_command_line
+    # Sets aside the current hosts file for re-use with the --no-provision flag.
+    # This is originally intended for use on a successful tests where the hosts
+    # are preserved (the --preserve-hosts option is set accordingly).
+    # It copies the current hosts file to the log directory, and rewrites the SUT
+    # names to match their names during the finishing run.
+    #
+    # @return nil
+    def preserve_hosts_file
+      preserved_hosts_filename = File.join(@options[:log_dated_dir], File.basename(@options[:hosts_file]))
+      FileUtils.cp(@options[:hosts_file], preserved_hosts_filename)
+      hosts_yaml = YAML.load_file(preserved_hosts_filename)
+      newly_keyed_hosts_entries = {}
+      hosts_yaml['HOSTS'].each do |host_name, host_hash|
+        @hosts.each do |host|
+          if host_name == host.instance_variable_get(:@name)
+            newly_keyed_hosts_entries[host.to_s] = host_hash
+            break
+          end
+        end
+      end
+      hosts_yaml['HOSTS'] = newly_keyed_hosts_entries
+      File.open(preserved_hosts_filename, 'w') do |file|
+        YAML.dump(hosts_yaml, file)
+      end
+      @options[:hosts_preserved_yaml_file] = preserved_hosts_filename
+    end
+
+    # Prints all information required to reproduce the current run & results to the log
+    # @see #print_env_vars_affecting_beaker
+    # @see #print_command_line
+    #
+    # @return nil
     def print_reproduction_info( log_level = :debug )
       print_command_line( log_level )
       print_env_vars_affecting_beaker( log_level )
@@ -187,13 +220,66 @@ module Beaker
     # Prints the command line that can be called to reproduce this run
     # (assuming the environment is the same)
     # @param [Symbol] log_level The log level (coloring) to print the message at
-    # @example Print pertinent env vars using error leve reporting (red)
+    # @example Print pertinent env vars using error level reporting (red)
     #     print_command_line :error
     #
+    # @note Re-use of already provisioned SUTs has been tested against the vmpooler & vagrant boxes.
+    #     Fusion doesn't need this, as it has no cleanup steps. Docker is untested at this time.
+    #     Please contact @electrical or the Puppet QE Team for more info, or for requests to support this.
+    #
     # @return nil
     def print_command_line( log_level = :debug )
       @logger.send(log_level, "\nYou can reproduce this run with:\n")
       @logger.send(log_level, @options[:command_line])
+      if @options[:hosts_preserved_yaml_file]
+        set_docker_warning = false
+        has_supported_hypervisor = false
+        @hosts.each do |host|
+          case host[:hypervisor]
+          when /vagrant|fusion|vmpooler|vcloud/
+            has_supported_hypervisor = true
+          when /docker/
+            set_docker_warning = true
+          end
+        end
+        if has_supported_hypervisor
+          reproducing_command = build_hosts_preserved_reproducing_command(@options[:command_line], @options[:hosts_preserved_yaml_file])
+          @logger.send(log_level, "\nYou can re-run commands against the already provisioned SUT(s) with:\n")
+          @logger.send(log_level, '(docker support is untested for this feature. please reference the docs for more info)') if set_docker_warning
+          @logger.send(log_level, reproducing_command)
+        end
+      end
+    end
+
+    # provides a new version of the command given, edited for re-use with a
+    # preserved host.  It does this by swapping the hosts file out for the
+    # new_hostsfile argument and setting the --no-provision flag, removing
+    # any previously set provisioning flags that it finds.
+    #
+    # @param [String] command Command line parameters to edit.
+    # @param [String] new_hostsfile Path to the new hosts file to use.
+    #
+    # @return [String] The command line parameters edited for re-use
+    def build_hosts_preserved_reproducing_command(command, new_hostsfile)
+      command_parts = command.split(' ')
+      has_no_provision_flag = false
+      replace_hosts_file_next = false
+      reproducing_command = []
+      command_parts.each do |part|
+        if replace_hosts_file_next
+          reproducing_command << new_hostsfile
+          replace_hosts_file_next = false
+          next
+        elsif part == '--provision' || part == '--no-provision'
+          has_no_provision_flag = true
+          next
+        elsif part == '--hosts'
+          replace_hosts_file_next = true
+        end
+        reproducing_command << part
+      end
+      reproducing_command << '--no-provision' unless has_no_provision_flag
+      reproducing_command.join(' ')
     end
   end
 end

data/lib/beaker/dsl/install_utils/puppet_utils.rb

@@ -369,15 +369,16 @@ module Beaker
           else
             dest = "C:\\Windows\\Temp\\#{host['dist']}.msi"
 
-            on host, "set PATH=\"%PATH%;#{host['puppetbindir']}\""
-            on host, "setx PATH \"%PATH%;#{host['puppetbindir']}\""
-
             on host, powershell("$webclient = New-Object System.Net.WebClient;  $webclient.DownloadFile('#{link}','#{dest}')")
 
-            on host, "if not exist #{host['distmoduledir']} (md #{host['distmoduledir']})"
+            host.mkdir_p host['distmoduledir']
           end
 
-          on host, "cmd /C 'start /w msiexec.exe /qn /i #{dest}'"
+          if host.is_cygwin?
+            on host, "cmd /C 'start /w msiexec.exe /qn /i #{dest}'"
+          else
+            on host, "start /w msiexec.exe /qn /i #{dest}"
+          end
         end
 
         # Installs Puppet and dependencies from dmg
@@ -542,18 +543,23 @@ module Beaker
         # @param [String] repo_configs_dir A local directory where repository files will be
         #                                  stored as an intermediate step before
         #                                  pushing them to the given host.
+        # @param [Hash{Symbol=>String}] opts Options to alter execution.
+        # @option opts [String] :dev_builds_url The URL to look for dev builds.
+        # @option opts [String, Array<String>] :dev_builds_repos The repo(s)
+        #                                       to check for dev builds in.
         #
         # @note This method only works on redhat-like and debian-like hosts.
         #
         def install_puppetlabs_dev_repo ( host, package_name, build_version,
-                                  repo_configs_dir = 'tmp/repo_configs' )
+                                  repo_configs_dir = 'tmp/repo_configs',
+                                  opts = options )
           variant, version, arch, codename = host['platform'].to_array
           platform_configs_dir = File.join(repo_configs_dir, variant)
 
           # some of the uses of dev_builds_url below can't include protocol info,
           # plus this opens up possibility of switching the behavior on provided
           # url type
-          _, protocol, hostname = options[:dev_builds_url].partition /.*:\/\//
+          _, protocol, hostname = opts[:dev_builds_url].partition /.*:\/\//
           dev_builds_url = protocol + hostname
 
           on host, "mkdir -p /root/#{package_name}"
@@ -583,25 +589,22 @@ module Beaker
                           repo_filename,
                           platform_configs_dir)
 
-            link = "%s/%s/%s/repos/%s/%s%s/PC1/%s/" %
-              [ dev_builds_url, package_name, build_version, variant,
-                fedora_prefix, version, arch ]
-
-            if not link_exists?( link )
-              link = "%s/%s/%s/repos/%s/%s%s/products/%s/" %
+            link = nil
+            package_repos = opts[:dev_builds_repos].nil? ? [] : [opts[:dev_builds_repos]]
+            package_repos.push(['products', 'devel']).flatten!
+            package_repos.each do |repo|
+              link =  "%s/%s/%s/repos/%s/%s%s/%s/%s/" %
                 [ dev_builds_url, package_name, build_version, variant,
-                  fedora_prefix, version, arch ]
-            end
-
-            if not link_exists?( link )
-              link = "%s/%s/%s/repos/%s/%s%s/devel/%s/" %
-                [ dev_builds_url, package_name, build_version, variant,
-                  fedora_prefix, version, arch ]
-            end
+                  fedora_prefix, version, repo, arch ]
 
-            if not link_exists?( link )
-              raise "Unable to reach a repo directory at #{link}"
+              unless link_exists?( link )
+                @logger.debug("couldn't find link at '#{repo}', falling back to next option...")
+              else
+                @logger.debug("found link at '#{repo}'")
+                break
+              end
             end
+            raise "Unable to reach a repo directory at #{link}" unless link_exists?( link )
 
             repo_dir = fetch_http_dir( link, platform_configs_dir )
 
@@ -632,11 +635,25 @@ module Beaker
             scp_to host, list, config_dir
             scp_to host, repo_dir, "/root/#{package_name}"
 
-            pc1_check = on( host,
-                           "[[ -d /root/#{package_name}/#{codename}/PC1 ]]",
-                            :acceptable_exit_codes => [0,1] )
+            repo_name = nil
+            package_repos = opts[:dev_builds_repos].nil? ? [] : [opts[:dev_builds_repos]]
+            package_repos.flatten!
+            package_repos.each do |repo|
+              repo_path = "/root/#{package_name}/#{codename}/#{repo}"
+              repo_check = on(host, "[[ -d #{repo_path} ]]", :acceptable_exit_codes => [0,1])
+              if repo_check.exit_code == 0
+                @logger.debug("found repo at '#{repo_path}'")
+                repo_name = repo
+                break
+              else
+                @logger.debug("couldn't find repo at '#{repo_path}', falling back to next option...")
+              end
+            end
+            if repo_name.nil?
+              repo_name = 'main'
+              @logger.debug("using default repo '#{repo_name}'")
+            end
 
-            repo_name = pc1_check.exit_code == 0 ? 'PC1' : 'main'
             search = "deb\\s\\+http:\\/\\/#{hostname}.*$"
             replace = "deb file:\\/\\/\\/root\\/#{package_name}\\/#{codename} #{codename} #{repo_name}"
             sed_command = "sed -i 's/#{search}/#{replace}/'"
@@ -728,11 +745,11 @@ module Beaker
         end
 
         # This method will install a pem file certifcate on a windows host
-        # 
+        #
         # @param [Host] host                 A host object
         # @param [String] cert_name          The name of the pem file
         # @param [String] cert               The contents of the certificate
-        #                  
+        #
         def install_cert_on_windows(host, cert_name, cert)
           create_remote_file(host, "C:\\Windows\\Temp\\#{cert_name}.pem", cert)
           on host, "certutil -v -addstore Root C:\\Windows\\Temp\\#{cert_name}.pem"