beaker 4.6.0 → 4.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfe2bb20761434d4a118e2f7d6f7d940cddb4567
-  data.tar.gz: a1101654d9482c2b736bebfc3cb667d90ee0e2e8
+  metadata.gz: 49a51b9e8d62155af1c109fe8edca707595c46ca
+  data.tar.gz: 20ebdd88c744771efa47cf79811fbfb0db2dddd3
 SHA512:
-  metadata.gz: 1daaad39aa4435d64c32ffc0ac4d7830bd75e133fab537bd10f476d26dbd720ceefb7936944997610113fa9182cd2f1a541c92fa46b729ce5c8fca3adfa39bc5
-  data.tar.gz: a8d275c8aa2ca31bfbfc23f0aa09590e99c41a23839830dcde71d5c9e4b7a2616e6b560d890e9b6601dd2e46e6cfef28bc5d8b5729024eedb727662396d31f88
+  metadata.gz: 2a0338731f2679539e2acfd39397fafb9dd658d6cb9f3c97f148e58f0f8d4380878349693926ba82096322ae19f1c3bcd4c36a9bcf6c577039f80d79b26f2c99
+  data.tar.gz: a080d53d6936470b925a16e13e6f851871f6e02187d5006c3ff799e487a93befb57a0302d8c905c1cd341142178162a1bf1e46512c723d03256d07fe3410e1ac

data/.travis.yml

@@ -6,6 +6,7 @@ script: "bundle exec rake travis"
 notifications:
   email: false
 rvm:
+  - 2.6
   - 2.0.0
   - 1.9.3
   - 1.8.7-p374

data/CHANGELOG.md

@@ -11,7 +11,20 @@ Tracking in this Changelog began for this project in version 3.25.0.
 If you're looking for changes from before this, refer to the project's
 git logs & PR history.
 
-# [Unreleased](https://github.com/puppetlabs/beaker/compare/4.6.0...master)
+# [Unreleased](https://github.com/puppetlabs/beaker/compare/4.7.0...master)
+
+# [4.7.0](https://github.com/puppetlabs/beaker/compare/4.6.0...4.7.0) - 2019-04-17
+
+### Added
+
+- Provide for OpenSSL 1.1.x+ support
+- enable Solaris10Sparc pkgutil SSL CA2 (IMAGES-844)
+
+### Changed
+- update pry-byebug dependency 3.4.2->3.6 (BKR-1568)
+- disabling hostkey checks for cisco hosts (QENG-7108)
+- Change behavior of ruby versioning to accept job-parameter RUBY\_VER
+- Change subcommand pre-suite to install ruby 2.3.1
 
 # [4.6.0](https://github.com/puppetlabs/beaker/compare/4.5.0...4.6.0) - 2019.03.07
 

data/acceptance/pre_suite/subcommands/05_install_ruby.rb

@@ -1,4 +1,9 @@
-test_name 'Install and configure Ruby 2.2.5 on the SUT' do
+ruby_version, ruby_source = ENV['RUBY_VER'], "job parameter"
+unless ruby_version
+  ruby_version = "2.3.1"
+  ruby_source = "default"
+end
+test_name "Install and configure Ruby #{ruby_version} (from #{ruby_source}) on the SUT" do
 
   step 'Ensure that the default system is an el-based system' do
     # The pre-suite currently only supports el systems, and we should
@@ -18,12 +23,12 @@ test_name 'Install and configure Ruby 2.2.5 on the SUT' do
     on default, 'yum install wget -y'
   end
 
-  step 'download and install ruby 2.2.5' do
-    on default, 'wget http://cache.ruby-lang.org/pub/ruby/2.2/ruby-2.2.5.tar.gz'
-    on default, 'tar xvfz ruby-2.2.5.tar.gz'
-    on default, 'cd ruby-2.2.5;./configure'
-    on default, 'cd ruby-2.2.5;make'
-    on default, 'cd ruby-2.2.5;make install'
+  step "download and install ruby #{ruby_version}" do
+    on default, "wget http://cache.ruby-lang.org/pub/ruby/#{ruby_version[0..2]}/ruby-#{ruby_version}.tar.gz"
+    on default, "tar xvfz ruby-#{ruby_version}.tar.gz"
+    on default, "cd ruby-#{ruby_version};./configure"
+    on default, "cd ruby-#{ruby_version};make"
+    on default, "cd ruby-#{ruby_version};make install"
   end
 
   step 'update gem on the SUT and install bundler' do

data/acceptance/pre_suite/subcommands/08_install_beaker.rb

@@ -17,6 +17,6 @@ test_name 'Install beaker and checkout branch if necessary' do
   step 'Build the gem and install it on the local system' do
     build_output = on(default, 'cd /opt/beaker/;gem build beaker.gemspec').stdout
     version = build_output.match(/^  File: (.+)$/)[1]
-    on(default, "cd /opt/beaker/;gem install #{version} --no-rdoc --no-ri; gem install beaker-vmpooler")
+    on(default, "cd /opt/beaker/;gem install #{version} --no-document; gem install beaker-vmpooler")
   end
 end

data/beaker.gemspec

@@ -38,12 +38,12 @@ Gem::Specification.new do |s|
   # Run time dependencies
   s.add_runtime_dependency 'minitest', '~> 5.4'
   s.add_runtime_dependency 'minitar', '~> 0.6'
-  s.add_runtime_dependency 'pry-byebug', '~> 3.4.2'
+  s.add_runtime_dependency 'pry-byebug', '~> 3.6'
   # pry-byebug can have issues with native readline libs so add rb-readline
   s.add_runtime_dependency 'rb-readline', '~> 0.5.3'
 
   s.add_runtime_dependency 'hocon', '~> 1.0'
-  s.add_runtime_dependency 'net-ssh', '~> 4.0'
+  s.add_runtime_dependency 'net-ssh', '~> 5.0'
   s.add_runtime_dependency 'net-scp', '~> 1.2'
   s.add_runtime_dependency 'inifile', '~> 3.0'
 

data/lib/beaker/host/cisco.rb

@@ -5,6 +5,19 @@ end
 module Cisco
   class Host < Unix::Host
 
+    # as the cisco hosts tend to have custom
+    # ssh configuration, the presets
+    # do not apply where verification of the
+    # host keys is disabled
+    def platform_defaults
+      h = Beaker::Options::OptionsHash.new
+      h.merge({
+        'ssh' => {
+          :verify_host_key => false,
+        },
+      })
+    end
+
     # Tells you whether a host platform supports beaker's
     #   {Beaker::HostPrebuiltSteps#set_env} method
     #

data/lib/beaker/host_prebuilt_steps.rb

@@ -23,7 +23,7 @@ module Beaker
     SLES_PACKAGES = ['curl', 'ntp']
     DEBIAN_PACKAGES = ['curl', 'ntpdate', 'lsb-release']
     CUMULUS_PACKAGES = ['curl', 'ntpdate']
-    SOLARIS10_PACKAGES = ['CSWcurl', 'CSWntp']
+    SOLARIS10_PACKAGES = ['CSWcurl', 'CSWntp', 'wget']
     SOLARIS11_PACKAGES = ['curl', 'ntp']
     ETC_HOSTS_PATH = "/etc/hosts"
     ETC_HOSTS_PATH_SOLARIS = "/etc/inet/hosts"

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '4.6.0'
+    STRING = '4.7.0'
   end
 end

data/spec/beaker/host/cisco_spec.rb

@@ -2,7 +2,9 @@ require 'spec_helper'
 
 module Cisco
   describe Host do
-    let(:options)  { @options ? @options : {} }
+    let(:options)  { @options ? @options : {
+      :user => 'root',
+    } }
     let(:platform) {
       if @platform
         { :platform => Beaker::Platform.new( @platform) }
@@ -58,6 +60,7 @@ module Cisco
         it 'retains user-specified prepend commands when adding vrf' do
           @options = {
             :vrf  => 'fakevrf',
+            :user => 'root',
           }
           answer_prepend_commands = 'prepend'
           answer_correct = 'source /etc/profile;ip netns exec fakevrf prepend'
@@ -92,7 +95,10 @@ module Cisco
         end
 
         it 'retains user-specified prepend commands when adding vrf' do
-          @options = { :vrf  => 'fakevrf', }
+          @options = { 
+            :vrf  => 'fakevrf', 
+            :user => 'root',
+          }
           answer_prepend_commands = 'prepend'
           answer_correct = 'source /etc/profile;ip netns exec fakevrf prepend'
           answer_test = host.prepend_commands( 'fake_command', answer_prepend_commands )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 4.7.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-07 00:00:00.000000000 Z
+date: 2019-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -176,14 +176,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: '3.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: rb-readline
   requirement: !ruby/object:Gem::Requirement
@@ -218,14 +218,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement