beaker 2.49.0 → 2.50.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWI4OTU0ZmQ1MGYzNmMxMzkwOWNlM2RmZjQzY2ZhZGIyMDc3MDdiNA==
+    YzlmMWE0ZTZiMmI4MmE4YmNkMTk1MmIwMGRmNTFiYmI1YWZkNThiNg==
   data.tar.gz: !binary |-
-    YWZiN2EwY2Y4NDMwNjRhODZiNjZjZmU4ZTU5YzVlMzBhZTk2ZmI1Nw==
+    OGIyMjM5NTA0MGY4OGU2NjU0Mjk2MWZmMTM2OWZhNjYyMTEyNDk0ZA==
 SHA512:
   metadata.gz: !binary |-
-    ZjI3YmQwZDJlMGI2OGI1OGJhMGE5YmUzMjZmNGM2ZjViODQ4MzBhYTYzMTNm
-    Zjg3OGVkMThhZDdiMmMwNWMyNzM3ZTNiZTY3ZTBhOTRkYjk2MTVmMTZmMmQ2
-    NjFmN2Y3MjkyY2VmYzQyZGJkZGI4ZmY5ZmNhNmY3OTA0MGI1YWE=
+    NmY1Y2M3YTMzMWY4NzM4ODY4NzFmMmI1ZjIwZWVkOTY4MTIyZGFkMWQ2MzY2
+    ZTE5OWFiZGYwY2I3MGQ5NmYwM2I4YzJlMzc1NDMwNWE2YjM1ODViOTc3ODMw
+    NDZlZTE0ZmQ0OWM5MjlkOTQ2MzBlYmQ2OThmNzBkNWI4OTBmN2Q=
   data.tar.gz: !binary |-
-    YjU4YzYzMTZiMGVkNTk3ODQ0M2Q4Njk1OTQzNDJlMzkzNjNkYmE0ZTcxMWNh
-    YmM0OTMxYjA4NjBhOGQ4MjU2YzM2YWYzZjZiZGQ2YzI4NWExZmMxZDRiZTYx
-    NGFmODM4ZDJiNDA1N2NmNDJiZmUyM2NkMGY0NWYyYTM5ZTYyNTA=
+    ZjMxMDlhYzcxZTk1ZDE0ODQ0ZDZiNzdiMWU2YjA0NjZjZGM2NzE3ODFkNGJk
+    OGQ4M2YzNDQwNGYyNTk1NGJkYWYwNTNhOThmZDhhMDRjNDM5YzY5MDFjYTQ5
+    MzZhNjY4MDhiMzcwOGZjMmM1YmJjZGE4ZWRhNjEyMjEyMDg5ZWI=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 11 Aug, 2016 (966f74b9)](#LATEST)
+* [LATEST - 22 Aug, 2016 (9358f2eb)](#LATEST)
+* [2.49.0 - 11 Aug, 2016 (53ba3f14)](#2.49.0)
 * [2.48.1 - 29 Jul, 2016 (e5a52ad4)](#2.48.1)
 * [2.48.0 - 27 Jul, 2016 (47d3aa18)](#2.48.0)
 * [2.47.1 - 15 Jul, 2016 (da89c35b)](#2.47.1)
@@ -127,7 +128,120 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 11 Aug, 2016 (966f74b9)
+### <a name = "LATEST">LATEST - 22 Aug, 2016 (9358f2eb)
+
+* (GEM) update beaker version to 2.50.0 (9358f2eb)
+
+* Merge pull request #1226 from kevpl/maint_rbvmomi_pin (5ad18987)
+
+
+```
+Merge pull request #1226 from kevpl/maint_rbvmomi_pin
+
+(BKR-918) pin rbvmomi to 1.8.0
+```
+* (BKR-918) pin rbvmomi to 1.8.0 (50270cf9)
+
+* Merge pull request #1223 from highb/fix/master/pe-17093_solaris_fixes (b90bc186)
+
+
+```
+Merge pull request #1223 from highb/fix/master/pe-17093_solaris_fixes
+
+(PE-17093) Solaris 10/11 pkg/pkgutil fixes
+```
+* Merge pull request #1221 from melissa/maint/master/test-foss-sles (fb02c924)
+
+
+```
+Merge pull request #1221 from melissa/maint/master/test-foss-sles
+
+(RE-7420) Add the ability to run FOSS tests on sles
+```
+* (PE-17093) pkgutil should be in path post install (725f5baf)
+
+
+```
+(PE-17093) pkgutil should be in path post install
+
+Prior to this commit I thought that I would need to specify
+the full path to pkgutil after installing it in order to use
+it.
+This commit removes the full path, because pkgutil should be
+in the system path after installation.
+```
+* (PE-17093) Solaris 10/11 pkg/pkgutil fixes (5fac81c9)
+
+
+```
+(PE-17093) Solaris 10/11 pkg/pkgutil fixes
+
+Prior to this commit Solaris 10 would blow up if pkgutil wasn't
+installed. Solaris 11 was not verifying that curl/ntp were installed.
+
+This commit adds logic to install pkgutil if it isn't found on
+Solaris 11, as well as adding package checks for Solaris 11 so that
+it actually verifies that ntp/curl are installed.
+```
+* Merge pull request #1218 from kevpl/acceptance_gather_hosts_tests (f878d2f8)
+
+
+```
+Merge pull request #1218 from kevpl/acceptance_gather_hosts_tests
+
+(MAINT) host acceptance tests refactor
+```
+* Merge pull request #1214 from petems/BKR-906-allow_mac_setting (3d21e843)
+
+
+```
+Merge pull request #1214 from petems/BKR-906-allow_mac_setting
+
+(BKR-906) Allow setting MAC address
+```
+* Merge pull request #1219 from ferglor/BKR-896-2 (9c1a25ee)
+
+
+```
+Merge pull request #1219 from ferglor/BKR-896-2
+
+(BKR-896) Fix SELinux context on root's SSH keys
+```
+* (BKR-860) Adding support for vagrant to quick start tasks. (#1199) (ff99eae3)
+
+
+```
+(BKR-860) Adding support for vagrant to quick start tasks. (#1199)
+
+* (BKR-860) - Adding support for vagrant to quick start tasks.
+
+* Adding tutorial doc.
+```
+* (RE-7420) Add the ability to run FOSS tests on sles (60893e2e)
+
+* (MAINT) host acceptance tests refactor (73176763)
+
+
+```
+(MAINT) host acceptance tests refactor
+
+- moved hosts-specific testing to a hosts folder rather than cluttering top-level dir
+- pulled reboot test into its own file, to make failures there more clear in reporting
+```
+* (BKR-896) Fix SELinux context on root's SSH keys (108d21d9)
+
+* (BKR-906) Allow setting MAC address (ae755e75)
+
+
+```
+(BKR-906) Allow setting MAC address
+
+* Everything else is configurable, makes sense to make mac configurable too!
+* Prevents issues with using vagrant-libvirt (https://github.com/vagrant-libvirt/vagrant-libvirt/issues/638)
+```
+### <a name = "2.49.0">2.49.0 - 11 Aug, 2016 (53ba3f14)
+
+* (HISTORY) update beaker history for gem release 2.49.0 (53ba3f14)
 
 * (GEM) update beaker version to 2.49.0 (966f74b9)
 

data/acceptance/tests/base/{host_test.rb → host/host_test.rb}

@@ -92,7 +92,7 @@ end
 
 step "#do_scp_to : can copy a directory to the host with no ignores"
 current_dir = File.dirname(__FILE__)
-module_fixture = File.join(current_dir, "../../fixtures/module")
+module_fixture = File.join(current_dir, "../../../fixtures/module")
 hosts.each do |host|
   logger.debug("can recursively copy a module over")
   #make sure that we are clean on the test host
@@ -117,7 +117,7 @@ end
 
 step "#do_scp_to with :ignore : can copy a dir to the host, excluding ignored patterns that DO NOT appear in the source absolute path"
 current_dir = File.dirname(__FILE__)
-module_fixture = File.expand_path(File.join(current_dir, "../../fixtures/module"))
+module_fixture = File.expand_path(File.join(current_dir, "../../../fixtures/module"))
 hosts.each do |host|
   logger.debug("can recursively copy a module over, ignoring some files/dirs")
   #make sure that we are clean on the test host
@@ -147,7 +147,7 @@ end
 
 step "#do_scp_to with :ignore : can copy a dir to the host, excluding ignored patterns that DO appear in the source absolute path"
 current_dir = File.dirname(__FILE__)
-module_fixture = File.expand_path(File.join(current_dir, "../../fixtures/module"))
+module_fixture = File.expand_path(File.join(current_dir, "../../../fixtures/module"))
 hosts.each do |host|
   logger.debug("can recursively copy a module over, ignoring some sub-files/sub-dirs that also appear in the absolute path")
   #make sure that we are clean on the test host
@@ -173,10 +173,4 @@ hosts.each do |host|
     end
     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
+end

data/acceptance/tests/base/{packages_unix.rb → host/packages_unix.rb}

@@ -2,7 +2,7 @@ test_name 'confirm unix-specific package methods work'
 confine :except, :platform => %w(windows solaris osx)
 
 current_dir  = File.dirname(__FILE__)
-pkg_fixtures = File.expand_path(File.join(current_dir, '../../fixtures/package'))
+pkg_fixtures = File.expand_path(File.join(current_dir, '../../../fixtures/package'))
 pkg_name     = 'puppetserver'
 
 def clean_file(host, file)

data/acceptance/tests/base/host/reboot_test.rb

@@ -0,0 +1,8 @@
+test_name 'Reboot Test' do
+  step "#reboot: can reboot the host" do
+    hosts.each do |host|
+      host.reboot
+      on host, "echo #{host} rebooted!"
+    end
+  end
+end

data/beaker.gemspec

@@ -47,7 +47,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'beaker-hostgenerator'
 
   # Optional provisioner specific support
-  s.add_runtime_dependency 'rbvmomi', '~> 1.8'
+  s.add_runtime_dependency 'rbvmomi', ['~> 1.8', '< 1.9.0']
   s.add_runtime_dependency 'fission', '~> 0.4'
   s.add_runtime_dependency 'google-api-client', ['~> 0.8', '< 0.9.5'] # dropped ruby 1.9 rupport in 0.9.5
   s.add_runtime_dependency 'aws-sdk-v1', '~> 1.57'

data/docs/tutorials/quick_start_rake_tasks.md

@@ -0,0 +1,211 @@
+#Beaker Quick Start Tasks
+
+We have developed some rake tasks to help new Beaker users get up and running quickly with writing and running tests.
+
+
+## Pre-requisites
+
+* You will need to have already completed the Beaker installation tutorial - [Beaker Installation](installation.md)
+
+* Hypervisors are services that provision SUTs for Beaker. We have made two available in this quick start guide to allow you to get up 
+and running. See the docs on how to setup [Vmpooler](../how_to/hypervisors/vsphere.md) and [Vagrant](../how_to/hypervisors/vagrant.md).
+
+
+## How to use them
+
+To use the tasks, you need to put the following line at the top of your project's rake file:
+
+    require 'beaker/tasks/quick_start'
+
+To check that you have access to the quickstart tasks from your project, run:
+
+    rake --tasks
+    
+You should see them listed along with any rake tasks you have defined in your local project rakefile:
+
+    rake beaker_quickstart:gen_hosts[hypervisor]  # Generate Default Beaker Host Config File, valid options are: vmpooler or vagrant
+    rake beaker_quickstart:gen_pre_suite           # Generate Default Pre-Suite
+    rake beaker_quickstart:gen_smoke_test          # Generate Default Smoke Test
+    rake beaker_quickstart:run_test[hypervisor]   # Run Default Smoke Test, after generating default host config and test files, valid 
+    options are: vmpooler or vagrant
+
+
+## Tasks
+
+### Hypervisor Argument
+
+Some of the tasks below take a 'hypervisor' argument that you can pass either 'vmpooler' or 'vagrant' to. If you leave it empty, the 
+task will default to using 'vagrant'.
+
+Example:
+
+    rake beaker_quickstart:gen_hosts[vmpooler]
+
+If you have the zsh shell then you will need to escape the square brackets:
+
+    rake beaker_quickstart:gen_hosts\[vmpooler\]
+    
+
+### Generate tasks
+
+These tasks are standalone and can be run independently from each other to generate the desired files.
+
+* beaker_quickstart:gen_hosts  (generates default host config)
+* beaker_quickstart:gen_pre_suite  (generates default pre-suite)
+* beaker_quickstart:gen_smoke_test  (generates default smoke test)
+
+#### gen_hosts
+
+To run:
+
+    rake beaker_quickstart:gen_hosts[hypervisor]
+
+The gen_hosts task will create a file 'default_hypervisor_hosts.yaml' in acceptance/config.
+
+If the file already exists, it will not be overwritten. This will allow you to play around with the config yourself, either by manually 
+editing the file or by using beaker-hostgenerator to generate a new hosts config.
+
+
+Vmpooler file (redhat 7 master and agent):
+
+    ---
+    HOSTS:
+      redhat7-64-1:
+        pe_dir: 
+        pe_ver: 
+        pe_upgrade_dir: 
+        pe_upgrade_ver: 
+        hypervisor: vmpooler
+        platform: el-7-x86_64
+        template: redhat-7-x86_64
+        roles:
+        - agent
+        - master
+        - database
+        - dashboard
+        - classifier
+        - default
+      redhat7-64-2:
+        pe_dir: 
+        pe_ver: 
+        pe_upgrade_dir: 
+        pe_upgrade_ver: 
+        hypervisor: vmpooler
+        platform: el-7-x86_64
+        template: redhat-7-x86_64
+        roles:
+        - agent
+        - frictionless
+    CONFIG:
+      nfs_server: none
+      consoleport: 443
+      pooling_api: http://vmpooler.delivery.puppetlabs.net/
+    
+
+
+Vagrant file (ubuntu 14 master and agent):
+
+    ---
+    HOSTS:
+      ubuntu1404-64-1:
+        pe_dir: 
+        pe_ver: 
+        pe_upgrade_dir: 
+        pe_upgrade_ver: 
+        platform: ubuntu-14.04-amd64
+        hypervisor: vagrant
+        roles:
+        - agent
+        - master
+        - database
+        - dashboard
+        - classifier
+        - default
+      ubuntu1404-64-2:
+        pe_dir: 
+        pe_ver: 
+        pe_upgrade_dir: 
+        pe_upgrade_ver: 
+        platform: ubuntu-14.04-amd64
+        hypervisor: vagrant
+        roles:
+        - agent
+        - frictionless
+    CONFIG:
+      nfs_server: none
+      consoleport: 443
+      box_url: https://vagrantcloud.com/puppetlabs/boxes/ubuntu-14.04-64-nocm
+      box: puppetlabs/ubuntu-14.04-64-nocm
+
+
+For more info on host generation and what these configs represent see - [Creating A Test Environment](creating_a_test_environment.md)
+
+
+### gen_pre_suite
+
+To run:
+
+    rake beaker_quickstart:gen_pre_suite
+    
+This task will generate a default Beaker pre-suite file.
+
+The gen_pre-suite task will create a file 'default_pre_suite.rb' in acceptance/setup.
+
+If the file already exists, it will not be overwritten. This will allow you to edit the pre_suite file yourself if required.
+
+pre_suite file:
+
+    install_puppet
+  
+See the [Test Suites doc](test_suites.md) in this directory for more information on pre-suites.
+
+
+### gen_smoke_test
+
+To run:
+
+    rake beaker_quickstart:gen_smoke_test
+    
+This task will generate a default Beaker smoke test file.
+
+The gen_smoke_test task will create a file 'default_smoke_test.rb' in acceptance/tests.
+
+If the file already exists, it will not be overwritten. This will allow you to edit the test file yourself if required.
+
+smoke test file:
+
+    test_name 'puppet install smoketest' do
+      step 'puppet install smoketest: verify \'puppet help\' can be successfully called on
+      all hosts' do
+            hosts.each do |host|
+              on host, puppet('help') 
+            end
+      end
+    end
+  
+This smoke test will check that Puppet has been successfully installed on the hosts.
+
+For more information on the Beaker dsl methods available to you in your tests see - [Beaker dsl](../how_to/the_beaker_dsl.md)
+
+
+### Run task
+
+The beaker_quickstart:run_test task will run all the above tasks in sequential order, to generate a hosts file, pre-suite file, smoke 
+test and then use these files to perform a Beaker test run. If the files already exist (see below for further info on file names and 
+location) then they will not be overwritten.
+ 
+
+#### run_test
+
+To run:
+  
+    rake beaker_quickstart:run_test[hypervisor]
+    
+This task will run the above 3 tasks in sequential order and then execute a Beaker test run using all 3 files.
+
+    beaker --hosts acceptance/config/default_vmpooler_hosts.yaml --pre-suite acceptance/setup/default_pre_suite.rb --tests 
+    acceptance/tests/default_smoke_test.rb
+
+You will end up with provisioned hosts with puppet installed and a test check executed to verify that puppet was installed.
+
+For more information on running Beaker tests see - [Test run](test_run.md)

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

@@ -979,7 +979,7 @@ module Beaker
                                   repo_configs_dir = nil,
                                   opts = options )
           variant, version, arch, codename = host['platform'].to_array
-          if variant !~ /^(fedora|el|centos|debian|ubuntu|cumulus|huaweios|cisco_nexus|cisco_ios_xr)$/
+          if variant !~ /^(fedora|el|centos|debian|ubuntu|cumulus|huaweios|cisco_nexus|cisco_ios_xr|sles)$/
             raise "No repository installation step for #{variant} yet..."
           end
           repo_configs_dir ||= 'tmp/repo_configs'

data/lib/beaker/host/mac/exec.rb

@@ -27,4 +27,12 @@ module Mac::Exec
     ssh_service_restart()
   end
 
+  # Checks if selinux is enabled
+  # selinux is not availble on OS X
+  #
+  # @return [Boolean] false 
+  def selinux_enabled?()
+    false
+  end
+
 end

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

@@ -294,4 +294,11 @@ module Unix::Exec
     end
   end
 
+  # Checks if selinux is enabled
+  #
+  # @return [Boolean] true if selinux is enabled, false otherwise 
+  def selinux_enabled?()
+    exec(Beaker::Command.new("sudo selinuxenabled"), :accept_all_exit_codes => true).exit_code == 0
+  end
+
 end

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

@@ -41,6 +41,8 @@ module Unix::File
     case self['platform']
     when /fedora|el-|centos/
       '/etc/yum.repos.d/'
+    when /sles/
+      '/etc/zypp/repos.d/'
     when /debian|ubuntu|cumulus|huaweios/
       '/etc/apt/sources.list.d'
     else
@@ -62,7 +64,7 @@ module Unix::File
     repo_filename = "pl-%s-%s-" % [ package_name, build_version ]
 
     case variant
-    when /fedora|el|centos|cisco_nexus|cisco_ios_xr/
+    when /fedora|el|centos|cisco_nexus|cisco_ios_xr|sles/
       variant = 'el' if variant == 'centos'
       if variant == 'cisco_nexus'
         variant = 'cisco-wrlinux'
@@ -101,7 +103,7 @@ module Unix::File
   # @return [String] Type of repo (rpm|deb)
   def repo_type
     case self['platform']
-    when /fedora|el-|centos/
+    when /fedora|el-|centos|sles/
       'rpm'
     when /debian|ubuntu|cumulus|huaweios/
       'deb'

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

@@ -92,6 +92,14 @@ module Unix::Pkg
         end
         execute("pkg #{cmdline_args} install #{name}", opts)
       when /solaris-10/
+        if ! check_for_command('pkgutil')
+          # https://www.opencsw.org/package/pkgutil/
+          noask_text = self.noask_file_text
+          create_remote_file self, File.join(noask_directory, 'noask'), noask_text
+          execute('pkgadd -d http://get.opencsw.org/now -a noask -n all', opts)
+          execute('/opt/csw/bin/pkgutil -U', opts)
+          execute('/opt/csw/bin/pkgutil -y -i pkgutil', opts)
+        end
         execute("pkgutil -i -y #{cmdline_args} #{name}", opts)
       when /openbsd/
         begin
@@ -131,7 +139,7 @@ module Unix::Pkg
   # @param [String] cmdline_args  Additional command line arguments for
   #                               the package manager.
   # @option opts [String] :package_proxy  A proxy of form http://host:port
-  # 
+  #
   # @return nil
   # @api public
   def install_package_with_rpm(name, cmdline_args = '', opts = {})
@@ -284,7 +292,7 @@ module Unix::Pkg
   # @param [String] url  A URL of form http://host:port
   # @return [String]     httpproxy and httport options for rpm
   #
-  # @raise [StandardError] When encountering a string that 
+  # @raise [StandardError] When encountering a string that
   #                        cannot be parsed
   # @api private
   def extract_rpm_proxy_options(url)

data/lib/beaker/host/windows/exec.rb

@@ -89,4 +89,13 @@ module Windows::Exec
     spacing = (user_pc && !cygwin_prefix.empty?) ? ' ' : ''
     "#{cygwin_prefix}#{spacing}#{user_pc}"
   end
+
+  # Checks if selinux is enabled
+  # selinux is not available on Windows
+  #
+  # @return [Boolean] false
+  def selinux_enabled?()
+    false
+  end
+
 end

data/lib/beaker/host_prebuilt_steps.rb

@@ -22,6 +22,7 @@ module Beaker
     DEBIAN_PACKAGES = ['curl', 'ntpdate', 'lsb-release']
     CUMULUS_PACKAGES = ['curl', 'ntpdate']
     SOLARIS10_PACKAGES = ['CSWcurl', 'CSWntp']
+    SOLARIS11_PACKAGES = ['curl', 'ntp']
     ETC_HOSTS_PATH = "/etc/hosts"
     ETC_HOSTS_PATH_SOLARIS = "/etc/inet/hosts"
     ROOT_KEYS_SCRIPT = "https://raw.githubusercontent.com/puppetlabs/puppetlabs-sshkeys/master/templates/scripts/manage_root_authorized_keys"
@@ -111,6 +112,8 @@ module Beaker
           check_and_install_packages_if_needed(host, OPENBSD_PACKAGES)
         when host['platform'] =~ /solaris-10/
           check_and_install_packages_if_needed(host, SOLARIS10_PACKAGES)
+        when host['platform'] =~ /solaris-1[1-9]/
+          check_and_install_packages_if_needed(host, SOLARIS11_PACKAGES)
         when host['platform'] !~ /debian|aix|solaris|windows|sles-|osx-|cumulus|f5-|netscaler|cisco_/
           check_and_install_packages_if_needed(host, UNIX_PACKAGES)
         end
@@ -368,6 +371,10 @@ module Beaker
         else
           host.exec(Command.new('sudo su -c "cp -r .ssh /root/."'), {:pty => true})
         end
+
+        if host.selinux_enabled?
+          host.exec(Command.new('sudo fixfiles restore /root'))
+        end
       end
     end
 

data/lib/beaker/hypervisor/vagrant.rb

@@ -18,6 +18,18 @@ module Beaker
       "10.255.#{rand_chunk}.#{rand_chunk}"
     end
 
+    def private_network_generator(host)
+      private_network_string = "    v.vm.network :private_network, ip: \"#{host['ip'].to_s}\", :netmask => \"#{host['netmask'] ||= "255.255.0.0"}\""
+      case host['network_mac']
+      when 'false'
+        private_network_string << "\n"
+      when nil
+        private_network_string << ", :mac => \"#{randmac}\"\n"
+      else
+        private_network_string << ", :mac => \"#{host['network_mac']}\"\n"
+      end
+    end
+
     def make_vfile hosts, options = {}
       #HACK HACK HACK - add checks here to ensure that we have box + box_url
       #generate the VagrantFile
@@ -33,9 +45,9 @@ module Beaker
         v_file << "    v.vm.box_version = '#{host['box_version']}'\n" unless host['box_version'].nil?
         v_file << "    v.vm.box_check_update = '#{host['box_check_update'] ||= 'true'}'\n"
         v_file << "    v.vm.synced_folder '.', '/vagrant', disabled: true\n" if host['synced_folder'] == 'disabled'
-        v_file << "    v.vm.network :private_network, ip: \"#{host['ip'].to_s}\", :netmask => \"#{host['netmask'] ||= "255.255.0.0"}\", :mac => \"#{randmac}\"\n"
+        v_file << private_network_generator(host)
 
-        unless host['mount_folders'].nil? 
+        unless host['mount_folders'].nil?
           host['mount_folders'].each do |name, folder|
             v_file << "    v.vm.synced_folder '#{folder[:from]}', '#{folder[:to]}', create: true\n"
           end
@@ -56,7 +68,7 @@ module Beaker
         end
 
         if /windows/i.match(host['platform'])
-          #due to a regression bug in versions of vagrant 1.6.2, 1.6.3, 1.6.4, >= 1.7.3 ssh fails to forward 
+          #due to a regression bug in versions of vagrant 1.6.2, 1.6.3, 1.6.4, >= 1.7.3 ssh fails to forward
           #automatically (note <=1.6.1, 1.6.5, 1.7.0 - 1.7.2 are uneffected)
           #Explicitly setting SSH port forwarding due to this bug
           v_file << "    v.vm.network :forwarded_port, guest: 22, host: 2222, id: 'ssh', auto_correct: true\n"

data/lib/beaker/tasks/quick_start.rb

@@ -1,49 +1,93 @@
 require 'beaker-hostgenerator'
 
+VAGRANT  = ['ubuntu1404-64default.mdcal-ubuntu1404-64af', '--hypervisor=vagrant',
+            '--global-config={box_url=https://vagrantcloud.com/puppetlabs/boxes/ubuntu-14.04-64-nocm,box=puppetlabs/ubuntu-14.04-64-nocm}']
+
+VMPOOLER = ['redhat7-64default.mdcal-redhat7-64af']
+
 namespace :beaker_quickstart do
 
-  desc 'Generate Default Beaker Host Config File'
-  task :gen_hosts do
-    cli = BeakerHostGenerator::CLI.new(['redhat7-64default.mdcal-redhat7-64af'])
+  desc 'Generate Default Beaker Host Config File, valid options are: vmpooler or vagrant.'
+  task :gen_hosts, [:hypervisor] do |t, args|
+    hosts_file = "acceptance/config/default_#{args[:hypervisor]}_hosts.yaml"
+    if args[:hypervisor] == 'vagrant'
+      cli = VAGRANT
+    elsif args[:hypervisor] == 'vmpooler'
+      cli = VMPOOLER
+    else
+      puts "No hypervisor provided, defaulting to vagrant."
+      hosts_file = "acceptance/config/default_vagrant_hosts.yaml"
+      cli = VAGRANT
+    end
     FileUtils.mkdir_p('acceptance/config') # -p ignores when dir already exists
-    File.open("acceptance/config/default_hosts.yaml", 'w') do |fh|
-      fh.print(cli.execute)
+    puts "About to run - beaker-hostgenerator #{cli.to_s.delete!('[]"')}"
+    if !File.exist?(hosts_file) then
+      puts "Writing default host config to file - #{hosts_file}"
+      File.open(hosts_file, 'w') do |fh|
+        fh.print(BeakerHostGenerator::CLI.new(cli).execute)
+      end
+    else
+      puts "Not overwriting Host Config File: #{hosts_file} - it already exists."
     end
   end
 
+
   desc 'Generate Default Pre-Suite'
   task :gen_pre_suite do
+    pre_suite_file = "acceptance/setup/default_pre_suite.rb"
     FileUtils.mkdir_p('acceptance/setup') # -p ignores when dir already exists
-    File.open("acceptance/setup/default_pre_suite.rb", 'w') do |fh|
-      fh.print('install_puppet')
+    if !File.exist?(pre_suite_file) then
+      puts "Writing default pre_suite to file - #{pre_suite_file}"
+      File.open(pre_suite_file, 'w') do |fh|
+        fh.print('install_puppet')
+      end
+    else
+      puts "Not overwriting Pre Suite File: #{pre_suite_file} - it already exists."
     end
   end
 
   desc 'Generate Default Smoke Test'
   task :gen_smoke_test do
+    smoke_test_file = "acceptance/setup/default_smoke_test.rb"
     FileUtils.mkdir_p('acceptance/tests') # -p ignores when dir already exists
-    File.open("acceptance/tests/default_smoke_test.rb", 'w') do |fh|
-      fh.print("test_name 'puppet install smoketest'
-step 'puppet install smoketest: verify \\'puppet help\\' can be successfully called on
-all hosts'
+    if !File.exist?(smoke_test_file) then
+      puts "Writing default smoke test to file - #{smoke_test_file}"
+      File.open("acceptance/tests/default_smoke_test.rb", 'w') do |fh|
+        fh.print("test_name 'puppet install smoketest' do
+  step 'puppet install smoketest: verify \\'puppet help\\' can be successfully called on
+  all hosts' do
     hosts.each do |host|
       on host, puppet('help')
-    end")
+    end
+  end
+end")
+      end
+    else
+      puts "Not overwriting Smoke Test File: #{smoke_test_file} - it already exists."
     end
   end
 
-  desc 'Run Default Smoke Test'
-  task :run => ['beaker_quickstart:gen_hosts', 'beaker_quickstart:gen_pre_suite', 'beaker_quickstart:gen_smoke_test'] do
-    system(beaker_command)
+  desc 'Run Default Smoke Test, after generating default host config and test files, valid options are: vmpooler or vagrant.'
+  task :run_test, [:hypervisor] => ["beaker_quickstart:gen_hosts", 'beaker_quickstart:gen_pre_suite',
+                                     'beaker_quickstart:gen_smoke_test'] do
+  |t, args|
+    hypervisor             = args[:hypervisor] ||='vagrant'
+    system_args             = Hash.new
+    system_args[:hosts]     = "acceptance/config/default_#{hypervisor}_hosts.yaml"
+    system_args[:pre_suite] = 'acceptance/setup/default_pre_suite.rb'
+    system_args[:tests]     = 'acceptance/tests/default_smoke_test.rb'
+    puts "About to run - #{beaker_command(system_args)}"
+    system(beaker_command(system_args))
   end
 
 end
 
-def beaker_command
+
+def beaker_command(system_args)
   cmd_parts = []
   cmd_parts << "beaker"
-  cmd_parts << "--hosts acceptance/config/default_hosts.yaml"
-  cmd_parts << "--pre-suite acceptance/setup/default_pre_suite.rb"
-  cmd_parts << "--tests acceptance/tests/default_smoke_test.rb"
+  cmd_parts << "--hosts #{system_args[:hosts]}"
+  cmd_parts << "--pre-suite #{system_args[:pre_suite]}"
+  cmd_parts << "--tests #{system_args[:tests]}"
   cmd_parts.flatten.join(" ")
 end

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.49.0'
+    STRING = '2.50.0'
   end
 end

data/spec/beaker/host/mac/exec_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+module Beaker
+  describe Mac::Exec do
+    class MacExecTest
+      include Mac::Exec
+
+      def initialize(hash, logger)
+        @hash = hash
+        @logger = logger
+      end
+
+      def [](k)
+        @hash[k]
+      end
+
+      def to_s
+        "me"
+      end
+
+    end
+
+    let (:opts)     { @opts || {} }
+    let (:logger)   { double( 'logger' ).as_null_object }
+    let (:instance) { MacExecTest.new(opts, logger) }
+
+    describe '#selinux_enabled?' do
+      it 'does not call selinuxenabled' do
+        expect(Beaker::Command).not_to receive(:new).with("sudo selinuxenabled")
+        expect(instance).not_to receive(:exec).with(0, :accept_all_exit_codes => true)
+        expect(instance.selinux_enabled?).to be === false
+      end
+    end
+  end
+end

data/spec/beaker/host/unix/exec_spec.rb

@@ -136,14 +136,26 @@ module Beaker
     end
 
     describe '#prepend_commands' do
-
       it 'returns the pc parameter unchanged for non-cisco platforms' do
         allow( instance ).to receive( :[] ).with( :platform ).and_return( 'notcisco' )
         answer_prepend_commands = 'pc_param_unchanged_13579'
         answer_test = instance.prepend_commands( 'fake_cmd', answer_prepend_commands )
         expect( answer_test ).to be === answer_prepend_commands
       end
+    end
 
+    describe '#selinux_enabled?' do
+      it 'calls selinuxenabled and selinux is enabled' do
+        expect(Beaker::Command).to receive(:new).with("sudo selinuxenabled").and_return(0)
+        expect(instance).to receive(:exec).with(0, :accept_all_exit_codes => true).and_return(generate_result("test", {:exit_code => 0}))
+        expect(instance.selinux_enabled?).to be === true
+      end
+
+      it 'calls selinuxenabled and selinux is not enabled' do
+        expect(Beaker::Command).to receive(:new).with("sudo selinuxenabled").and_return(1)
+        expect(instance).to receive(:exec).with(1, :accept_all_exit_codes => true).and_return(generate_result("test", {:exit_code => 1}))
+        expect(instance.selinux_enabled?).to be === false
+      end
     end
   end
 end

data/spec/beaker/host/unix/file_spec.rb

@@ -67,6 +67,11 @@ module Beaker
         expect( instance.package_config_dir ).to be === '/etc/apt/sources.list.d'
       end
 
+      it 'returns correctly for sles-based platforms' do
+        @platform = 'sles-12-x86_64'
+        expect( instance.package_config_dir ).to be === '/etc/zypp/repos.d/'
+      end
+
       it 'errors for all other platform types' do
         @platform = 'eos-4-x86_64'
         expect {
@@ -84,6 +89,13 @@ module Beaker
         expect( filename ).to match( /sion7\-el\-/ )
       end
 
+      it 'sets the sles portion correctly for sles platforms' do
+        @platform = 'sles-11-x86_64'
+        allow( instance ).to receive( :is_pe? ) { false }
+        filename = instance.repo_filename( 'pkg_name', 'pkg_version7' )
+        expect( filename ).to match( /sion7\-sles\-/ )
+      end
+
       it 'builds the filename correctly for el-based platforms' do
         @platform = 'el-21-x86_64'
         allow( instance ).to receive( :is_pe? ) { false }

data/spec/beaker/host/windows/exec_spec.rb

@@ -43,5 +43,13 @@ module Beaker
         expect( command_str ).not_to match( /cmd\.exe/ )
       end
     end
+
+    describe '#selinux_enabled?' do
+      it 'does not call selinuxenabled' do
+        expect(Beaker::Command).not_to receive(:new).with("sudo selinuxenabled")
+        expect(instance).not_to receive(:exec).with(0, :accept_all_exit_codes => true)
+        expect(instance.selinux_enabled?).to be === false
+      end
+    end
   end
 end

data/spec/beaker/hypervisor/vagrant_spec.rb

@@ -117,6 +117,36 @@ EOF
       expect( vagrantfile ).to match(/v.vm.synced_folder .* disabled: true/)
     end
 
+    it "can make a Vagrantfile with network mac autogenerated" do
+      path = vagrant.instance_variable_get( :@vagrant_path )
+
+      hosts = make_hosts({},1)
+      vagrant.make_vfile( hosts, options )
+
+      vagrantfile = File.read( File.expand_path( File.join( path, "Vagrantfile")))
+      expect( vagrantfile ).to match(/v.vm.network :private_network, ip: "ip.address.for.vm1", :netmask => "255.255.0.0", :mac => ".+/)
+    end
+
+    it "can make a Vagrantfile with network mac specified" do
+      path = vagrant.instance_variable_get( :@vagrant_path )
+
+      hosts = make_hosts({:network_mac => 'b6:33:ae:19:48:f9'},1)
+      vagrant.make_vfile( hosts, options )
+
+      vagrantfile = File.read( File.expand_path( File.join( path, "Vagrantfile")))
+      expect( vagrantfile ).to match(/v.vm.network :private_network, ip: "ip.address.for.vm1", :netmask => "255.255.0.0", :mac => "b6:33:ae:19:48:f9/)
+    end
+
+    it "can make a Vagrantfile with network mac disabled" do
+      path = vagrant.instance_variable_get( :@vagrant_path )
+
+      hosts = make_hosts({:network_mac => 'false'},1)
+      vagrant.make_vfile( hosts, options )
+
+      vagrantfile = File.read( File.expand_path( File.join( path, "Vagrantfile")))
+      expect( vagrantfile ).to match(/v.vm.network :private_network, ip: "ip.address.for.vm1", :netmask => "255.255.0.0"/)
+    end
+
     it "generates a valid windows config" do
       path = vagrant.instance_variable_get( :@vagrant_path )
       allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )
@@ -151,19 +181,19 @@ EOF
       expect( match ).to_not be nil
 
     end
-    
+
     it "uses the cpus defined per vagrant host" do
       path = vagrant.instance_variable_get( :@vagrant_path )
       allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )
-  
+
       vagrant.make_vfile( @hosts, {'vagrant_cpus' => 'goodbye!'} )
-  
+
       generated_file = File.read( File.expand_path( File.join( path, "Vagrantfile") ) )
-  
+
       match = generated_file.match(/vb.customize \['modifyvm', :id, '--memory', '1024', '--cpus', 'goodbye!'\]/)
-  
+
       expect( match ).to_not be nil
-  
+
     end
 
     context "port forwarding rules" do
@@ -269,6 +299,8 @@ EOF
         host[:platform] = 'unix'
 
         expect( Command ).to receive( :new ).with("sudo su -c \"cp -r .ssh /root/.\"").once
+        expect( Command ).to receive( :new ).with("sudo fixfiles restore /root").once
+        expect( Command ).to receive( :new ).with("sudo selinuxenabled").once
 
         vagrant.copy_ssh_to_root( host, options )
 
@@ -279,9 +311,17 @@ EOF
         host[:platform] = 'windows'
         expect( host ).to receive( :is_cygwin? ).and_return(true)
 
+        expect( Command ).to_not receive( :new ).with("sudo fixfiles restore /root")
         expect( Command ).to receive( :new ).with("cp -r .ssh /cygdrive/c/Users/Administrator/.").once
         expect( Command ).to receive( :new ).with("chown -R Administrator /cygdrive/c/Users/Administrator/.ssh").once
 
+        # This is checked on all platforms since Linux isn't called out specifically in the code
+        # If this fails, nothing further is activated
+        result = Beaker::Result.new(host, '')
+        result.exit_code = 1
+        expect( Command ).to receive( :new ).with("sudo selinuxenabled")
+        allow( host ).to receive(:exec).and_return(result)
+
         vagrant.copy_ssh_to_root( host, options )
 
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.49.0
+  version: 2.50.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-11 00:00:00.000000000 Z
+date: 2016-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -311,6 +311,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -318,6 +321,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: fission
   requirement: !ruby/object:Gem::Requirement
@@ -552,10 +558,11 @@ files:
 - acceptance/tests/base/dsl/platform_tag_confiner_test.rb
 - acceptance/tests/base/dsl/structure_test.rb
 - acceptance/tests/base/external_resources_test.rb
+- acceptance/tests/base/host/host_test.rb
+- acceptance/tests/base/host/packages.rb
+- acceptance/tests/base/host/packages_unix.rb
+- acceptance/tests/base/host/reboot_test.rb
 - acceptance/tests/base/host_prebuilt_steps/ssh_environment_test.rb
-- acceptance/tests/base/host_test.rb
-- acceptance/tests/base/packages.rb
-- acceptance/tests/base/packages_unix.rb
 - acceptance/tests/base/test_suite/export.rb
 - acceptance/tests/hypervisor/communication_test.rb
 - acceptance/tests/install/from_file.rb
@@ -609,6 +616,7 @@ files:
 - docs/tutorials/how_to_beaker.md
 - docs/tutorials/installation.md
 - docs/tutorials/lets_write_a_test.md
+- docs/tutorials/quick_start_rake_tasks.md
 - docs/tutorials/test_run.md
 - docs/tutorials/test_suites.md
 - docs/tutorials/the_command_line.md
@@ -749,6 +757,7 @@ files:
 - spec/beaker/host/eos_spec.rb
 - spec/beaker/host/freebsd/exec_spec.rb
 - spec/beaker/host/freebsd/pkg_spec.rb
+- spec/beaker/host/mac/exec_spec.rb
 - spec/beaker/host/mac/group_spec.rb
 - spec/beaker/host/mac/user_spec.rb
 - spec/beaker/host/mac_spec.rb