beaker-abs 0.2.0 → 0.3.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZTg4M2E4ZGUxNWQzMDM0MDFhYjlhMDY4YWFhNWI3ODk2ZGY1NDE4Ng==
-  data.tar.gz: !binary |-
-    ZGUwOWJhZDZmMWE1YmNkYjBhYmEzNzIwZTc4MjRjZGExZmM5OTRmNA==
+SHA1:
+  metadata.gz: 7368f79fad3e2f153910b013aa69eca32d05970d
+  data.tar.gz: dd38119800e44a48abe03b50fbb15c61400c293c
 SHA512:
-  metadata.gz: !binary |-
-    NmI2YWJjOTA0ZTRkYWE4ZTE3MjVmZTBkNDBiOTIyYmNhNzk5NzVlYTIzMmYy
-    YjVmMTYyYTBmMDBmZGZlMzg4NDg4ZDU2YTNiYzQ3NzA1NWQ2NWVhOTQxOWFk
-    NTJmZDQ2MzVlNWVjNGYyZGVjNzZhODA5NzU2YTEyNjQ1M2VkYmI=
-  data.tar.gz: !binary |-
-    N2Q0MmViY2I0NmQxNGY3MGU4YjRiZmZiYzFkOTY1ZWQwNGIwNTYxNmYzMjJi
-    OWI5MzE1NDgxOGNkZWJkNDYwYmVkYjE0N2FiMDI5NmRmNzJiODhhNWY4MDI4
-    ZGMzZTYyY2VlZWQ1MWM2NDdmZWViZDBhNmI4NTg1MWU2ZGQ1ZDc=
+  metadata.gz: 1f6259cefad7b1939cfa66b60b39eaa7c681ce229643ec7bb2c9180aba436c3e29abc692d34fe477bf21fdbbcaa34e470b72ff40a7de1059d8b08bc4bf071eab
+  data.tar.gz: 72fde57f1d1a73104e1a544c890537d07ab373a31e763911961aff3d295617899cc2488a6656022120058048a9867c01857a9473a82cc533d6e18896c9c585dc

data/HISTORY.md

@@ -1,12 +1,29 @@
 # qe_beaker-abs_bump_and_tag_master - History
 ## Tags
-* [LATEST - 24 Oct, 2016 (4c14d730)](#LATEST)
+* [LATEST - 14 Aug, 2017 (26840bd3)](#LATEST)
+* [0.2.0 - 24 Oct, 2016 (44ff3935)](#0.2.0)
 * [0.1.3 - 16 Sep, 2016 (6f1ced08)](#0.1.3)
 * [0.1.2 - 16 Sep, 2016 (b914ae60)](#0.1.2)
 * [0.1.1 - 16 Sep, 2016 (10ee39cf)](#0.1.1)
 
 ## Details
-### <a name = "LATEST">LATEST - 24 Oct, 2016 (4c14d730)
+### <a name = "LATEST">LATEST - 14 Aug, 2017 (26840bd3)
+
+* (GEM) update beaker-abs version to 0.3.0 (26840bd3)
+
+* Merge pull request #9 from rishijavia/BKR-1155-third_attempt (859cb1ec)
+
+
+```
+Merge pull request #9 from rishijavia/BKR-1155-third_attempt
+
+(BKR-1155) Override beaker's default ssh connection preference
+```
+* (BKR-1155) Override beaker's default ssh connection preference (8bab8a1c)
+
+### <a name = "0.2.0">0.2.0 - 24 Oct, 2016 (44ff3935)
+
+* (HISTORY) update beaker-abs history for gem release 0.2.0 (44ff3935)
 
 * (GEM) update beaker-abs version to 0.2.0 (4c14d730)
 

data/lib/beaker-abs/version.rb

@@ -1,5 +1,5 @@
 module BeakerAbs
   module Version
-    STRING = '0.2.0'
+    STRING = '0.3.0'
   end
 end

data/lib/beaker/hypervisor/abs.rb

@@ -13,15 +13,39 @@ module Beaker
       @resource_hosts = JSON.parse(resource_hosts)
     end
 
+    def connection_preference(host)
+      vmhostname = host[:vmhostname]
+      if vmhostname && host[:hypervisor] == 'abs'
+        @resource_hosts.each do |resource_host|
+          if resource_host['hostname'] == vmhostname
+            engine = resource_host['engine']
+            case engine
+            when /^(vmpooler|nspooler)$/
+              # putting ip last as its not set by ABS
+              return [:vmhostname, :hostname, :ip]
+            else
+              super
+            end
+          end
+        end
+      end
+      super
+    end
+
     def provision
       type2hosts = {}
 
       # Each resource_host is of the form:
       # {
-      #   "hostname" => "1234567890",
+      #   "hostname" => "mkbx0m6dnnntgz1.delivery.puppetlabs.net",
       #   "type"     => "centos-7-i386",
       #   "engine"   => "vmpooler",
       # }
+      # {
+      #   "hostname" => "sol10-1.delivery.puppetlabs.net",
+      #   "type"     => "solaris-10-sparc",
+      #   "engine"   => "nspooler",
+      # }
       @resource_hosts.each do |resource_host|
         type = resource_host['type']
         type2hosts[type] ||= []
@@ -40,6 +64,9 @@ module Beaker
           raise ArgumentError.new("Failed to provision host '#{host.hostname}', no template of type '#{host['template']}' was provided.")
         end
       end
+      if Beaker::Hypervisor.respond_to?(:set_ssh_connection_preference)
+        Beaker::Hypervisor.set_ssh_connection_preference(@hosts, self)
+      end
     end
 
     def cleanup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-abs
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Josh Cooper
@@ -9,68 +9,68 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-24 00:00:00.000000000 Z
+date: 2017-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: beaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.9.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.9.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
 description: Adds a custom hypervisor that uses hosts provisioned by the Always Be
@@ -82,8 +82,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - HISTORY.md
 - LICENSE.txt
@@ -104,17 +104,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Let's test Puppet, using hosts provisioned by Always Be Scheduling service.