beaker-vagrant 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: be5bca0523dc11ccbf64ec70bb412249c0f066ac
-  data.tar.gz: 42598743132e53abaaf332f544314af3e2679246
+SHA256:
+  metadata.gz: 1a1524342ffb1c304a8a133be595b5c67917259594d1388faa3a72bf83a036d6
+  data.tar.gz: 28c291e666ba4f4e9ffdf82f2528f715a1a500831435751c81e77975b687de83
 SHA512:
-  metadata.gz: f4b5d2b30e983d9c6e76c550ca0fc83c34416589f2aa35cd0096897d39d54560d0a4edb7fce58b878e56e1ab5c8cf043198a4819b40b77a13aed3920bdf80188
-  data.tar.gz: 731c1ba2c3ded6af01c86397e0e850f0832857b53071dd194f963f29c18870ae02805438752677f3fbe805a58ff0d7eb99b13bf1d45705495f2c37eccfd42893
+  metadata.gz: a0c98e170395954cd257c1eafe4a42a01ad4fd9ca42ab3431afea0f371685e2908d7f33d46c7c4a527d2b7ae22593b15238c6ad4c81d12e49bee36cc3116249d
+  data.tar.gz: 9c6711c31ceb636ab9dfc03d9a827bcca69d052e0c2e2ea6e978efa86a1256c129c9e585bf07da7a66e29bb54cc204e0e78baa1fbca259e06e93e3c2bc23ae58

data/Gemfile

@@ -18,7 +18,7 @@ end
 # We don't put beaker in as a test dependency because we
 # don't want to create a transitive dependency
 group :acceptance_testing do
-  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 3.0')
+  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 4.0')
 end
 
 

data/README.md

@@ -40,3 +40,12 @@ bundle exec rake test:acceptance
 # Contributing
 
 Please refer to puppetlabs/beaker's [contributing](https://github.com/puppetlabs/beaker/blob/master/CONTRIBUTING.md) guide.
+
+# Release
+
+To release new versions, we use a
+[Jenkins job](https://jenkins-sre.delivery.puppetlabs.net/view/all/job/qe_beaker-vagrant_init-multijob_master/)
+(access to internal infrastructure will be required to view job).
+
+To release a new version (from the master branch), you'll need to just provide
+a new beaker-pe version number to the job, and you're off to the races.

data/beaker-vagrant.gemspec

@@ -32,7 +32,6 @@ Gem::Specification.new do |s|
 
   # Documentation dependencies
   s.add_development_dependency 'yard'
-  s.add_development_dependency 'markdown'
   s.add_development_dependency 'thin'
 
   # Run time dependencies

data/lib/beaker-vagrant/version.rb

@@ -1,3 +1,3 @@
 module BeakerVagrant
-  VERSION = '0.6.2'
+  VERSION = '0.6.3'
 end

data/lib/beaker/hypervisor/vagrant.rb

@@ -291,18 +291,25 @@ module Beaker
 
     def vagrant_cmd(args)
       Dir.chdir(@vagrant_path) do
-        exit_status = 1
-        Open3.popen3(@vagrant_env, "vagrant #{args}") {|stdin, stdout, stderr, wait_thr|
-          while line = stdout.gets
-            @logger.info(line)
-          end
-          if not wait_thr.value.success?
-            raise "Failed to exec 'vagrant #{args}'. Error was #{stderr.read}"
+        begin
+          retries ||=0
+          Open3.popen3(@vagrant_env, "vagrant #{args}") {|stdin, stdout, stderr, wait_thr|
+            while line = stdout.gets
+              @logger.info(line)
+            end
+
+            unless wait_thr.value.success?
+              raise "Failed to exec 'vagrant #{args}'. Error was #{stderr.read}"
+            end
+          }
+        rescue => e
+          if e =~ /WinRM/m
+            sleep(10)
+
+            retry if (retries += 1) < 6
           end
-          exit_status = wait_thr.value
-        }
-        if exit_status != 0
-          raise "Failed to execute vagrant_cmd ( #{args} ). Error was #{stderr.read}"
+
+          raise e
         end
       end
     end

data/lib/beaker/hypervisor/vagrant_libvirt.rb

@@ -23,6 +23,7 @@ class Beaker::VagrantLibvirt < Beaker::Vagrant
     "    v.vm.provider :libvirt do |node|\n" +
       "      node.cpus = #{cpus(host, options)}\n" +
       "      node.memory = #{memsize(host, options)}\n" +
+      "      node.qemu_use_session = false\n" +
       build_options_str(options) +
       "    end\n"
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-vagrant
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Rishi Javia, Kevin Imber, Tony Vu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-11 00:00:00.000000000 Z
+date: 2019-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -108,20 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: markdown
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
@@ -209,8 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Beaker DSL Extension Helpers!