beaker 2.46.0 → 2.47.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTY0YTEwOTYzZjU0ODM0NmVmNzFhNzg0MWU4YjA4ZDljNWFmMTc4ZQ==
+    NjI2YzY2M2ViYjg0OTEyNGI2ZDc3ZTg4OGUxODgxNDQ3NzhiOWFjMw==
   data.tar.gz: !binary |-
-    MzU1YzQ0MjczYTA4OTdjNDQyZmE5MDM5MTUyYjY4ZTE3N2FlNWZlZg==
+    ODVlZDM2ODQwYjg2ZDAyOGNjYzkxOTU2OWM1MWI4MzhhYzVjNzNlMQ==
 SHA512:
   metadata.gz: !binary |-
-    YTgzYTZhNTQyMDgxOGU3MDA1YTQyNDA2YWEzNGM3NzBhODc3NTJiM2QxZWRh
-    Y2NiNjgxNzQ0MmVlYmZmZjRhOGY5YWE1Yjc4MjZmNGFjOWMwODk1ZDUzZDQ5
-    ZWEzMzUxNDEyNGNmZjk0YmQ4ODQ4ZTYwNjZkM2RiNTE1NTE5NmM=
+    YmJmNTY4NjA4NzQxZDFiZjZlYzI2ODg4Y2IxZGE2ZjMzMTllMjdkYWU5OTM5
+    MTg0OTJmNjkwYWYwZjY4MGNmMWNmYmFhMWM4ZmM2YTNlZjg3NDg2ZjdhOWNj
+    Njk5OTY0MTczZTJjNzJiODIxNTk3OWIzZjY4MGMzNzM0MmNjM2Q=
   data.tar.gz: !binary |-
-    MTM1YjhlODRiNTlhNTU0MjNiMGNkZjk4NTU5N2JhZmFlYmEyY2IxZmNmOGNk
-    ZWYxMmQyM2I4MWNmNWI2NTM3ZGE0YTY1ZTg4N2M5NDMyMzA3Nzc5YTE1Y2Ux
-    YWFiYTdhOTYwMDQ2ZjY2ZTZhMTViZDlkOGY1YzIwYzY3MzhmYjg=
+    YTY1YWUxYjhhZDVjNzBlNDkxMWRkMzI5MDA5ZTM1OTRjOGNhM2I4MTUyNmQx
+    N2IwYTg5M2E2ODY2Yjk0Yzg0MmQ3Yjc3NjkwYzEzOGE2ZmMxMjBiMzAxYWMx
+    YzAxOTRmZjRjNTRhZGIxNzRjMTExYmYxN2JjMzI1ZjJiNjA5YWQ=

data/CONTRIBUTING.md

@@ -2,13 +2,11 @@
 
 ## Getting Started
 
-* If it is accessible to you, create a [Jira account](http://tickets.puppetlabs.com)
+* Create a [Jira account](http://tickets.puppetlabs.com)
 * Make sure you have a [GitHub account](https://github.com/signup/free)
 * Submit a ticket for your issue, assuming one does not already exist.
   * Clearly describe the issue including steps to reproduce when it is a bug.
-  * File in the appropriate location:
-    * Using your [Jira account](http://tickets.puppetlabs.com)
-      * Beaker bugs are submitted in the [BKR project](https://tickets.puppetlabs.com/issues/?jql=project%20%3D%20BKR)
+  * File a ticket in the [BKR project](https://tickets.puppetlabs.com/issues/?jql=project%20%3D%20BKR)
 * Fork the [Beaker repository on GitHub](https://github.com/puppetlabs/beaker)
 
 ## Making Changes
@@ -33,15 +31,22 @@
     from our issue tracker.  The body describes the behavior without the patch,
     why this is a problem, and how the patch fixes the problem when applied.
 ````
- 
-* Make sure you have added [RSpec](http://rspec.info/) tests that exercise your new code.  These test should be located in the appropriate `beaker/spec/` subdirectory.  The addition of new methods/classes or the addition of code paths to existing methods/classes requires additional RSpec coverage.
-  * Beaker uses RSpec 3.1.0+, and you should **NOT USE** deprecated `should`/`stub` methods - **USE** `expect`/`allow`.  Use of deprecated RSpec methods will result in your patch being rejected.  See a nice blog post from 2013 on [RSpec's new message expectation syntax](http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/).
-* Make sure that you have added documentation using [Yard](http://yardoc.org/), new methods/classes without apporpriate documentation will be rejected.
-* Run the tests to assure nothing else was accidentally broken, using `rake test`
-  * **Bonus**: if possible ensure that `rake test` runs without failures for additional Ruby versions (1.9, 2.0, etc). Beaker supports Ruby 1.9+, and breakage of support for older/newer rubies will cause a patch to be rejected.
+
 * During the time that you are working on your patch the master Beaker branch may have changed - you'll want to [rebase](http://git-scm.com/book/en/Git-Branching-Rebasing) before you submit your PR with `git rebase master`.  A successful rebase ensures that your patch will cleanly merge into Beaker.
 * Submitted patches will be smoke tested through a series of acceptance level tests that ensures basic Beaker functionality - the results of these tests will be evaluated by a Beaker team member.  Failures associated with the submitted patch will result in the patch being rejected.
 
+### Testing
+
+* Make sure you have added [RSpec](http://rspec.info/) tests that exercise your new code.  These test should be located in the appropriate `beaker/spec/` subdirectory.  The addition of new methods/classes or the addition of code paths to existing methods/classes requires additional RSpec coverage.
+  * Beaker uses RSpec 3.1.0+, and you should **NOT USE** deprecated `should`/`stub` methods - **USE** `expect`/`allow`.  Use of deprecated RSpec methods will result in your patch being rejected.  See a nice blog post from 2013 on [RSpec's new message expectation syntax](http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/).
+  * Run the tests to assure nothing else was accidentally broken, using `rake test`
+    * **Bonus**: if possible ensure that `rake test` runs without failures for additional Ruby versions (1.9, 2.0, etc). Beaker supports Ruby 1.9+, and breakage of support for older/newer rubies will cause a patch to be rejected.
+
+### Documentation
+
+* Make sure that you have added documentation using [Yard](http://yardoc.org/), new methods/classes without appropriate documentation will be rejected.
+* More user friendly documentation will be required for PRs unless exempted. Documentation lives in the [docs/ folder](docs).
+
 ## Making Trivial Changes
 
 ### Maintenance

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 8 Jul, 2016 (0fb3408c)](#LATEST)
+* [LATEST - 13 Jul, 2016 (8bd72c92)](#LATEST)
+* [2.46.0 - 8 Jul, 2016 (3a650c95)](#2.46.0)
 * [2.45.0 - 29 Jun, 2016 (c0b56972)](#2.45.0)
 * [2.44.0 - 9 Jun, 2016 (38dfb77f)](#2.44.0)
 * [2.43.0 - 1 Jun, 2016 (777469ca)](#2.43.0)
@@ -122,7 +123,149 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 8 Jul, 2016 (0fb3408c)
+### <a name = "LATEST">LATEST - 13 Jul, 2016 (8bd72c92)
+
+* (GEM) update beaker version to 2.47.0 (8bd72c92)
+
+* Merge pull request #1181 from tvpartytonight/maint_pin_gems (e89c0b8f)
+
+
+```
+Merge pull request #1181 from tvpartytonight/maint_pin_gems
+
+(maint) Pin gems that removed ruby 1.9.3 support
+```
+* (maint) Pin gems that removed ruby 1.9.3 support (94bd58e8)
+
+
+```
+(maint) Pin gems that removed ruby 1.9.3 support
+
+This PR pins gems that are transitive dependencies that dropped ruby
+1.9.3 support. This should be removed eventually, as these gems are not
+actually needed by beaker itself, but by gems beaker relies on.
+```
+* (BKR-859) Add rake quick start tasks (#1176) (31a99a1a)
+
+
+```
+(BKR-859) Add rake quick start tasks (#1176)
+
+* (BKR-859) Add rake quick start tasks
+For generating hosts file, test suite and running test (on vmpooler)
+
+* Some fixes.
+```
+* Merge pull request #1129 from samwoods1/install_in_parallel (c8d60edf)
+
+
+```
+Merge pull request #1129 from samwoods1/install_in_parallel
+
+(QA-2501) add ability to install hosts in parallel
+```
+* Merge pull request #1178 from tvpartytonight/BKR-869 (7b71a640)
+
+
+```
+Merge pull request #1178 from tvpartytonight/BKR-869
+
+(BKR-869) Skip deploy_package_repo tests when Fedora
+```
+* Merge pull request #1177 from tvpartytonight/BKR-871_revert (4b875e9b)
+
+
+```
+Merge pull request #1177 from tvpartytonight/BKR-871_revert
+
+Revert "(BKR-871) Don't test packages on Windows"
+```
+* (BKR-869) Skip deploy_package_repo tests when Fedora (0491cffa)
+
+
+```
+(BKR-869) Skip deploy_package_repo tests when Fedora
+
+Because we are missing packages for Fedora for puppetserver, we should
+skip them until they become available.
+```
+* Merge pull request #1169 from james-stocks/BKR-797 (b7eab4ea)
+
+
+```
+Merge pull request #1169 from james-stocks/BKR-797
+
+(BKR-797) timesync helper should handle ntpd already running
+```
+* (BKR-874) PUPPET_MODULE_INSTALL_IGNORE (#1175) (8b0c4a4e)
+
+
+```
+(BKR-874) PUPPET_MODULE_INSTALL_IGNORE (#1175)
+
+Updated the filtering on PUPPET_MODULE_INSTALL_IGNORE to exclude .svn,
+junit, pkg and example folders
+```
+* Revert "(BKR-871) Don't test packages on Windows" (3f8afefc)
+
+
+```
+Revert "(BKR-871) Don't test packages on Windows"
+
+This reverts commit 480cbad5f8b75c9cb96d104e2537bc8771ed4f8c.
+```
+* Merge pull request #1174 from erosa/maint/master/fix-dsl-example (f2274451)
+
+
+```
+Merge pull request #1174 from erosa/maint/master/fix-dsl-example
+
+(maint) Add missing parenthesis in dsl.rb docs
+```
+* Merge pull request #1172 from kevpl/docs_add_doc_requirement (4b2ea02b)
+
+
+```
+Merge pull request #1172 from kevpl/docs_add_doc_requirement
+
+(MAINT) updated contributor guidelines
+```
+* (maint) Add missing parenthesis in dsl.rb docs (51eeaf19)
+
+
+```
+(maint) Add missing parenthesis in dsl.rb docs
+
+Prior to this commit, there was a missing closing paren in the code
+examples in the DSL documentation.
+
+This commit rectifies that issue.
+```
+* (MAINT) updated contributor guidelines (395d0696)
+
+
+```
+(MAINT) updated contributor guidelines
+
+added in user friendly docs & acceptance testing requirements
+[skip ci]
+```
+* (BKR-797) timesync helper should handle ntpd already running (d77c3bb5)
+
+
+```
+(BKR-797) timesync helper should handle ntpd already running
+
+This commit fixes a bug where timesync causes beaker to error if the host has ntpd already running.
+The fix is simply to use the -u option for ntpdate to use an alternate network port.
+
+Tested on Redhat and Ubuntu.
+```
+* (QA-2501) add ability to install hosts in parallel (de50ffe1)
+
+### <a name = "2.46.0">2.46.0 - 8 Jul, 2016 (3a650c95)
+
+* (HISTORY) update beaker history for gem release 2.46.0 (3a650c95)
 
 * (GEM) update beaker version to 2.46.0 (0fb3408c)
 

data/acceptance/tests/base/dsl/helpers/host_helpers/on_test.rb

@@ -106,4 +106,36 @@ test_name "dsl::helpers::host_helpers #on" do
       assert_match /\d+:\d+/, stdout
     end
   end
+
+  step "#on executes in parallel with :run_in_parallel => true" do
+    parent_pid = Process.pid
+    results = on( hosts, %Q{echo "${RANDOM}:${RANDOM}:${RANDOM}"}, :run_in_parallel => true) {
+      assert(Process.pid != parent_pid)
+    }
+
+    # assert that we got results back for every host
+    assert_equal hosts.size, results.size
+
+    # that they were all successful runs
+    results.each do |result|
+      assert_equal 0, result.exit_code
+    end
+
+    # and that we have |hosts| distinct outputs
+    unique_outputs = results.map(&:output).uniq
+    assert_equal hosts.size, unique_outputs.size
+  end
+
+  step "#on in parallel exits after all processes complete if an exception is raised in one process" do
+    start = Time.now
+
+    tmp = nil
+    assert_raises NoMethodError do
+      on( hosts, %Q{echo "blah"}, :run_in_parallel => true) {
+        sleep(1)
+        tmp.blah
+      }
+    end
+    assert(Time.now > start + 1)
+  end
 end

data/acceptance/tests/base/packages.rb

@@ -1,5 +1,5 @@
 test_name 'confirm packages on hosts behave correctly'
-confine :except, :platform => [/osx/,/windows/]
+confine :except, :platform => %w(osx)
 
 def get_host_pkg(host)
   case
@@ -74,4 +74,4 @@ hosts.each do |host|
     end
   end
 
-end
+end

data/acceptance/tests/base/packages_unix.rb

@@ -56,6 +56,7 @@ end
 
 step '#deploy_package_repo : deploy puppet-server nightly repo'
 hosts.each do |host|
+  next if host['platform'] =~ /fedora/
   host.deploy_package_repo(pkg_fixtures, pkg_name, 'latest')
   clean_file(host, pkg_name)
 end

data/beaker.gemspec

@@ -24,13 +24,15 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake', '~> 10.1'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'pry', '~> 0.10'
-  s.add_development_dependency 'beaker-hostgenerator'
 
   # Documentation dependencies
   s.add_development_dependency 'yard'
   s.add_development_dependency 'markdown'
   s.add_development_dependency 'thin'
 
+  # Temporary pin for gems no longer compatible with ruby 1.9.3
+  s.add_development_dependency 'activesupport', '~> 4.2'
+  s.add_development_dependency 'rack', '~> 1.6'
   # Run time dependencies
   s.add_runtime_dependency 'minitest', '~> 5.4'
   s.add_runtime_dependency 'json', '~> 1.8'
@@ -40,12 +42,14 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'inifile', '~> 2.0'
   s.add_runtime_dependency 'rsync', '~> 1.0.9'
   s.add_runtime_dependency 'open_uri_redirections', '~> 0.2.1'
+  s.add_runtime_dependency 'in-parallel', '~> 0.1'
 
   # Run time dependencies that are Beaker libraries
   s.add_runtime_dependency 'beaker-answers', '~> 0.0'
   s.add_runtime_dependency 'stringify-hash', '~> 0.0'
   s.add_runtime_dependency 'beaker-hiera', '~> 0.0'
   s.add_runtime_dependency 'beaker-pe', '~> 0.0'
+  s.add_runtime_dependency 'beaker-hostgenerator'
 
   # Optional provisioner specific support
   s.add_runtime_dependency 'rbvmomi', '~> 1.8'

data/docs/Argument-Processing-and-Precedence.md

@@ -16,13 +16,16 @@ Beaker uses arguments and settings from a variety of sources to determine how yo
 ```
         BEAKER VARIABLE NAME  => ENVIRONMENT VARIABLE NAME
         :home                 => 'HOME',
-        :project              => ['BEAKER_PROJECT', 'BEAKER_project'],
+        :project              => ['BEAKER_PROJECT', 'BEAKER_project', 'JOB_NAME'],
         :department           => ['BEAKER_DEPARTMENT', 'BEAKER_department'],
         :jenkins_build_url    => ['BEAKER_BUILD_URL', 'BUILD_URL'],
         :created_by           => ['BEAKER_CREATED_BY'],
         :consoleport          => ['BEAKER_CONSOLEPORT', 'consoleport'],
         :is_pe                => ['BEAKER_IS_PE', 'IS_PE'],
         :pe_dir               => ['BEAKER_PE_DIR', 'pe_dist_dir'],
+        :puppet_agent_version => ['BEAKER_PUPPET_AGENT_VERSION'],
+        :puppet_agent_sha     => ['BEAKER_PUPPET_AGENT_SHA'],
+        :puppet_collection    => ['BEAKER_PUPPET_COLLECTION'],
         :pe_version_file      => ['BEAKER_PE_VERSION_FILE', 'pe_version_file'],
         :pe_ver               => ['BEAKER_PE_VER', 'pe_ver'],
         :forge_host           => ['BEAKER_FORGE_HOST', 'forge_host'],
@@ -31,7 +34,9 @@ Beaker uses arguments and settings from a variety of sources to determine how yo
         :release_yum_repo_url => ['BEAKER_RELEASE_YUM_REPO', 'RELEASE_YUM_REPO'],
         :dev_builds_url       => ['BEAKER_DEV_BUILDS_URL', 'DEV_BUILDS_URL'],
         :vbguest_plugin       => ['BEAKER_VB_GUEST_PLUGIN', 'BEAKER_vb_guest_plugin'],
-        :answers              => [/\Aq_*'/],
+        :tag_includes         => ['BEAKER_TAG'],
+        :tag_excludes         => ['BEAKER_EXCLUDE_TAG'],
+        :run_in_parallel      => ['BEAKER_RUN_IN_PARALLEL'],
 ```
 ## Host File Options
 Any values included for an individual host in a host file.
@@ -191,10 +196,14 @@ Values already included in Beaker as defaults for required arguments.
           :project                => 'Beaker',
           :department             => 'unknown',
           :created_by             => ENV['USER'] || ENV['USERNAME'] || 'unknown',
+          :host_tags              => {},
           :openstack_api_key      => ENV['OS_PASSWORD'],
           :openstack_username     => ENV['OS_USERNAME'],
           :openstack_auth_url     => "#{ENV['OS_AUTH_URL']}/tokens",
           :openstack_tenant       => ENV['OS_TENANT_NAME'],
+          :openstack_keyname      => ENV['OS_KEYNAME'],
+          :openstack_network      => ENV['OS_NETWORK'],
+          :openstack_region       => ENV['OS_REGION'],
           :jenkins_build_url      => nil,
           :validate               => true,
           :configure              => true,
@@ -211,25 +220,29 @@ Values already included in Beaker as defaults for required arguments.
           :project_root           => File.expand_path(File.join(File.dirname(__FILE__), "../")),
           :xml_dir                => 'junit',
           :xml_file               => 'beaker_junit.xml',
+          :xml_time               => 'beaker_times.xml',
+          :xml_time_enabled       => false,
           :xml_stylesheet         => 'junit.xsl',
+          :default_log_prefix     => 'beaker_logs',
           :log_dir                => 'log',
           :log_sut_event          => 'sut.log',
           :color                  => true,
           :dry_run                => false,
-          :timeout                => 300,
+          :tag_includes           => '',
+          :tag_excludes           => '',
+          :timeout                => 900, # 15 minutes
           :fail_mode              => 'slow',
           :accept_all_exit_codes  => false,
           :timesync               => false,
           :disable_iptables       => false,
           :set_env                => true,
+          :disable_updates        => true,
           :repo_proxy             => false,
           :package_proxy          => false,
           :add_el_extras          => false,
-          :release_apt_repo_url   => "http://apt.puppetlabs.com",
-          :release_yum_repo_url   => "http://yum.puppetlabs.com",
-          :dev_builds_url         => "http://builds.delivery.puppetlabs.net",
           :epel_url               => "http://mirrors.kernel.org/fedora-epel",
           :epel_arch              => "i386",
+          :epel_7_pkg             => "epel-release-7-6.noarch.rpm",
           :epel_6_pkg             => "epel-release-6-8.noarch.rpm",
           :epel_5_pkg             => "epel-release-5-4.noarch.rpm",
           :consoleport            => 443,
@@ -237,51 +250,30 @@ Values already included in Beaker as defaults for required arguments.
           :pe_version_file        => 'LATEST',
           :pe_version_file_win    => 'LATEST-win',
           :host_env               => {},
+          :host_name_prefix       => nil,
           :ssh_env_file           => '~/.ssh/environment',
           :profile_d_env_file     => '/etc/profile.d/beaker_env.sh',
-          :answers                => {
-                                     :q_puppet_enterpriseconsole_auth_user_email    => 'admin@example.com',
-                                     :q_puppet_enterpriseconsole_auth_password      => '~!@#$%^*-/ aZ',
-                                     :q_puppet_enterpriseconsole_smtp_port          => 25,
-                                     :q_puppet_enterpriseconsole_smtp_use_tls       => 'n',
-                                     :q_verify_packages                             => 'y',
-                                     :q_puppetdb_password                           => '~!@#$%^*-/ aZ',
-                                     :q_puppetmaster_enterpriseconsole_port         => 443,
-                                     :q_puppet_enterpriseconsole_auth_database_name => 'console_auth',
-                                     :q_puppet_enterpriseconsole_auth_database_user => 'mYu7hu3r',
-                                     :q_puppet_enterpriseconsole_database_name      => 'console',
-                                     :q_puppet_enterpriseconsole_database_user      => 'mYc0nS03u3r',
-                                     :q_database_root_password                      => '=ZYdjiP3jCwV5eo9s1MBd',
-                                     :q_database_root_user                          => 'pe-postgres',
-                                     :q_database_export_dir                         => '/tmp',
-                                     :q_puppetdb_database_name                      => 'pe-puppetdb',
-                                     :q_puppetdb_database_user                      => 'mYpdBu3r',
-                                     :q_database_port                               => 5432,
-                                     :q_puppetdb_port                               => 8081,
-                                     :q_classifier_database_user                    => 'DFGhjlkj',
-                                     :q_database_name                               => 'pe-classifier',
-                                     :q_classifier_database_password                => '~!@#$%^*-/ aZ',
-                                     :q_activity_database_user                      => 'adsfglkj',
-                                     :q_activity_database_name                      => 'pe-activity',
-                                     :q_activity_database_password                  => '~!@#$%^*-/ aZ',
-                                     :q_rbac_database_user                          => 'RbhNBklm',
-                                     :q_rbac_database_name                          => 'pe-rbac',
-                                     :q_rbac_database_password                      => '~!@#$%^*-/ aZ',
-                                     :q_install_update_server                       => 'y',
-          },
           :dot_fog                => File.join(ENV['HOME'], '.fog'),
           :ec2_yaml               => 'config/image_templates/ec2.yaml',
           :help                   => false,
-          :collect_perf_data      => false,
+          :collect_perf_data      => 'none',
+          :puppetdb_port_ssl      => 8081,
+          :puppetdb_port_nonssl   => 8080,
+          :puppetserver_port      => 8140,
+          :nodeclassifier_port    => 4433,
+          :cache_files_locally    => true,
+          :aws_keyname_modifier   => rand(10 ** 10).to_s.rjust(10,'0'), # 10 digit random number string
+          :run_in_parallel        => [],
           :ssh                    => {
                                      :config                => false,
                                      :paranoid              => false,
-                                     :timeout               => 300,
                                      :auth_methods          => ["publickey"],
                                      :port                  => 22,
                                      :forward_agent         => true,
                                      :keys                  => ["#{ENV['HOME']}/.ssh/id_rsa"],
                                      :user_known_hosts_file => "#{ENV['HOME']}/.ssh/known_hosts",
+                                     :keepalive             => true
+
           }
         }
 ```