beaker-abs 0.1.3 → 0.6.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzRmYjY5ODQ2NzcyZDRlMjcxN2YyNDM4ZjA4OGQ2Y2ExZjA0OGNlOA==
-  data.tar.gz: !binary |-
-    YmE2YjQxZjkwMDZjZWMwZWJhY2VlZTYwN2FmZDZjNTZkMTlhNzBhNg==
+SHA256:
+  metadata.gz: 0d6faecffc36e445ec8fecf9fd7a92a4ffbcb6fb41ef755bff6a42438a71df44
+  data.tar.gz: 6d46f12b1100a9911850f955e3c3c55100e48b4ab03c01d36cb6466ca862b1c4
 SHA512:
-  metadata.gz: !binary |-
-    MWU3YWQxZWQwZjgwOGRiOTlhMjcyMTk5ZWYzYTUzODA2NzA1OTgyODU5ZmJh
-    ZjRjZmY5ZDk4MzdhOThjNjg5ZDc1Mjc2ZTgwMTI0Y2Q2OWI0ZDAxNmIxNGYx
-    Zjg5MTM0OWI5ODg0NzA1MjJjZGE0ZTE0NmY4Y2Y1NzhlYjc3NzU=
-  data.tar.gz: !binary |-
-    NTEyMjJmNDI1ZTI2MmY1NDJiY2Q5YzRkNTM3NTJlNTkwNGVmZDNlMjY2NWQ1
-    Y2M3NGQzMjgxNmQ3ZTJmZmViZGM2YTVkNjE1NmEzOTdmMGUxYjc4MDdiYjdl
-    YWFiMTVmNTc1NDM3ODM4OWUyY2Q4MDBkMmRiNzQ5ODZiYmJhNzA=
+  metadata.gz: bd6bf6f23b7faed7d1da6d92d1fd718239bb8b5d186b6f7e2c3eeeeb121dc1e63db0a540e180099fca2c85f880479e368933871f75c068dbdb43e8011b1bdfa3
+  data.tar.gz: f168b9d3adcaf60c0daee56d356e772e0aeccd790379730dba7a99c6e2ec511ebf614bf953a6b5d3a0e6c22c063f4bb337ebd2cf11225829f5a391b67941b5d4

data/.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "13:00"
+  open-pull-requests-limit: 10

data/.travis.yml

@@ -1,5 +1,6 @@
-sudo: false
 language: ruby
 rvm:
-  - 2.1.8
-before_install: gem install bundler -v 1.12.3
+  - 2.6
+before_install:
+  - gem install bundler
+

data/CODEOWNERS

@@ -0,0 +1 @@
+* @puppetlabs/beaker

data/HISTORY.md

@@ -1,11 +1,67 @@
 # qe_beaker-abs_bump_and_tag_master - History
 ## Tags
-* [LATEST - 16 Sep, 2016 (3d6ed7b7)](#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 - 16 Sep, 2016 (3d6ed7b7)
+### <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)
+
+* Merge pull request #5 from puppetlabs/beaker3-conflict (54001ff7)
+
+
+```
+Merge pull request #5 from puppetlabs/beaker3-conflict
+
+(QENG-4472) Relax version constraints
+```
+* (QENG-4472) Relax version constraints (574d1d95)
+
+
+```
+(QENG-4472) Relax version constraints
+
+Previously, we were pessimistically pinned to beaker 2.x, which meant
+projects could not use both beaker 3 and beaker-abs simultaneously.
+
+Beaker-abs only requires a version of beaker supporting the custom
+hypervisor API. Due to a beaker bug, custom hypervisors did not work
+until beaker 2.9.0 in commit d45e723cd. We also require less than beaker
+4 to prevent future incompatibilities.
+```
+* (MAINT) Update Development notes on releasing (80972ba9)
+
+* Merge pull request #4 from puppetlabs/update-dev-section-in-readme (9f4acbe1)
+
+
+```
+Merge pull request #4 from puppetlabs/update-dev-section-in-readme
+
+(MAINT) Update Development notes on releasing
+```
+### <a name = "0.1.3">0.1.3 - 16 Sep, 2016 (6f1ced08)
+
+* (HISTORY) update beaker-abs history for gem release 0.1.3 (6f1ced08)
 
 * (GEM) update beaker-abs version to 0.1.3 (3d6ed7b7)
 

data/README.md

@@ -1,22 +1,21 @@
-# BeakerAbs
+# beaker-abs
 
 Implements a Beaker hypervisor that makes hosts provisioned by the AlwaysBeScheduling service available to a Beaker run.
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Beaker will automatically load the appropriate hypervisors for any given hosts file, so as long as your project dependencies are satisfied there's nothing else to do. No need to `require` this library in your tests.
 
-```ruby
-gem 'beaker-abs'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
+As of Beaker 4.0, all hypervisor and DSL extension libraries have been removed and are no longer dependencies. In order to use a specific hypervisor or DSL extension library in your project, you will need to include them alongside Beaker in your Gemfile or project.gemspec. E.g.
 
-    $ gem install beaker-abs
+~~~ruby
+# Gemfile
+gem 'beaker', '~>4.0'
+gem 'beaker-abs'
+# project.gemspec
+s.add_runtime_dependency 'beaker', '~>4.0'
+s.add_runtime_dependency 'beaker-abs'
+~~~
 
 ## Usage
 
@@ -42,12 +41,28 @@ env ABS_RESOURCE_HOSTS=<data> beaker --hosts hosts.yaml
 ```
 
 Beaker will populate the `vmhostname` property for each host using information provided by the AlwaysBeScheduling service.
+This is typically used in a CI scenario, where the jenkins run-me-maybe plugin is populating the ABS_RESOURCE_HOSTS variable.
+
+### Using vmfloaty
+
+If you do not specify a ABS_RESOURCE_HOSTS and request to provision via the beaker options, beaker-abs will fallback to using
+your vmfloaty configuration. By default it will look for the service named 'abs'. The name can also be configured via 
+the environment variable ABS_SERVICE_NAME or the top level option in the hosts file abs_service_name. Similarly, the priority defaults to "1" which means
+it will take precedence over CI tests. Be careful not to run a CI test with this option. The priority can be configured via
+the environment variable ABS_SERVICE_PRIORITY or the top level option in the hosts file abs_service_priority.
 
 ## Development
 
 After checking out the repo, run `bundle install --path .bundle` to install dependencies. Then, run `bundle exec rake test` to run the tests.
 
-To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To release a new version, run the [release pipeline](https://jenkins-qe.delivery.puppetlabs.net/job/qe_beaker-abs_init-multijob_master/) 
+(infrastructure access is required) and provide the following parameters:
+
+- PUBLIC: Whether to release the gem to rubygems.org
+- version: Desired version to release
+
+The pipeline will update the version number in `version.rb`, create a git tag for the version, push git commits and tags to
+GitHub, and optionally push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 

data/beaker-abs.gemspec

@@ -18,9 +18,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.12"
+  spec.add_dependency "beaker", "~> 4.0"
+  spec.add_dependency "vmfloaty", "~> 1.0.0"
+  spec.add_development_dependency "bundler", "~> 2.1"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
 
-  spec.add_runtime_dependency "beaker", "~> 2.49"
 end

data/lib/beaker-abs/version.rb

@@ -1,5 +1,5 @@
 module BeakerAbs
   module Version
-    STRING = '0.1.3'
+    STRING = '0.6.0'
   end
 end

data/lib/beaker/hypervisor/abs.rb

@@ -1,5 +1,9 @@
 require 'beaker'
 require 'json'
+require 'pry-byebug'
+require 'vmfloaty'
+require 'vmfloaty/conf'
+require 'vmfloaty/utils'
 
 module Beaker
   class Abs < Beaker::Hypervisor
@@ -9,23 +13,53 @@ module Beaker
       @hosts = hosts
 
       resource_hosts = ENV['ABS_RESOURCE_HOSTS'] || @options[:abs_resource_hosts]
-      raise ArgumentError.new("ABS_RESOURCE_HOSTS must be specified when using the Beaker::Abs hypervisor") if resource_hosts.nil?
+
+      @abs_service_name = ENV['ABS_SERVICE_NAME'] || @options[:abs_service_name] || "abs"
+      @abs_service_priority = ENV['ABS_SERVICE_PRIORITY'] || @options[:abs_service_priority] || "1"
+
+      raise ArgumentError.new("ABS_RESOURCE_HOSTS must be specified when using the Beaker::Abs hypervisor when provisioning") if resource_hosts.nil? && !options[:provision]
+      resource_hosts = provision_vms(hosts).to_json if resource_hosts.nil?
       @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] ||= []
         type2hosts[type] << resource_host['hostname']
+        type2hosts[type] << resource_host['ip']
       end
 
       # for each host, get a vm for that template type
@@ -36,14 +70,91 @@ module Beaker
 
         if provisioned_hosts = type2hosts[template]
           host['vmhostname'] = provisioned_hosts.shift
+          host['ip'] = provisioned_hosts.shift
         else
           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
       # nothing to do
     end
+
+    def provision_vms(hosts)
+
+      verbose = false
+      config = Conf.read_config # get the vmfloaty config file in home dir
+
+      # TODO: the options object provided by the floaty cli is required in get_service_config()
+      # we should make it optional or accept nil
+      cli = Object.new
+      def cli.service() @abs_service_name end
+      def cli.priority() @abs_service_priority end # forces going ahead of queue
+      def cli.url() nil end
+      def cli.token() nil end
+      def cli.user() nil end
+
+      #the service object is the interfacte to all methods
+      abs_service = Service.new(cli, config)
+      supported_vm_list = abs_service.list(verbose)
+      supported_vm_list = supported_vm_list.reject { |e| e.empty? }
+      supported_vm_list = supported_vm_list.reject { |e| e.start_with?("*") }
+
+      vm_request = generate_floaty_request_strings(hosts, supported_vm_list)
+
+
+      vm_beaker_abs = []
+      # Will return a JSON Object like this:
+      # {"redhat-7-x86_64"=>["rich-apparition.delivery.puppetlabs.net", "despondent-side.delivery.puppetlabs.net"], "centos-7-x86_64"=>["firmer-vamp.delivery.puppetlabs.net"]}
+      os_types = Utils.generate_os_hash(vm_request.split)
+      vm_floaty_output = abs_service.retrieve(verbose, os_types)
+
+
+      raise ArgumentError.new("Timed out getting the ABS resources") if vm_floaty_output.nil?
+      vm_floaty_output_cleaned = Utils.standardize_hostnames(vm_floaty_output)
+      vm_floaty_output_cleaned.each do |os_platform, value|
+        # filter any extra key that does not have an Array value
+        if !value.is_a?(Array)
+          next
+        end
+        value.each do | hostname |
+          # I don't think the engine is being used by the beaker-abs process
+          vm_beaker_abs.push({"hostname": hostname, "type": os_platform, "engine":"beaker-abs"})
+        end
+      end
+
+      # to do need to figure out what the NSPooler requests are, and combine the output for that with vm_beaker_abs and return that object
+      # for now just returning vmpooler abs object
+      vm_beaker_abs
+    end
+
+    # Based upon the host file, this method counts the number of each template needed
+    # and generates the host=Xnum eg redhat-7-x86_64=2 expected by floaty
+    def generate_floaty_request_strings(hosts, supported_vm_list)
+      vm_list = {}
+
+      hosts.each do |host|
+        if supported_vm_list.include?(host[:template])
+          if vm_list.include?(host[:template])
+            vm_list[host[:template]] = vm_list[host[:template]] + 1
+          else
+            vm_list[host[:template]] = 1
+          end
+        else
+          raise ArgumentError.new("#{host.name} has a template #{host[:template]} that is not found in vmpooler or nspooler")
+        end
+      end
+
+      vm_request = ""
+      vm_list.each do |key, value|
+        vm_request.concat("#{key}=#{value} ")
+      end
+
+      vm_request
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-abs
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Josh Cooper
@@ -9,64 +9,78 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-16 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: beaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
-  type: :development
+        version: '4.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: vmfloaty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: beaker
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.49'
-  type: :runtime
+        version: '5.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.49'
+        version: '5.0'
 description: Adds a custom hypervisor that uses hosts provisioned by the Always Be
   Scheduling service.
 email:
@@ -76,12 +90,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".github/dependabot.yml"
+- ".gitignore"
+- ".travis.yml"
+- CODEOWNERS
 - Gemfile
 - HISTORY.md
 - LICENSE.txt
-- MAINTAINERS
 - README.md
 - Rakefile
 - beaker-abs.gemspec
@@ -98,17 +113,16 @@ 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: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Let's test Puppet, using hosts provisioned by Always Be Scheduling service.

data/MAINTAINERS

@@ -1,17 +0,0 @@
-{
-  "version": 1,
-  "file_format": "This MAINTAINERS file format is described at http://pup.pt/maintainers",
-  "issues": "https://tickets.puppetlabs.com/browse/QENG/",
-  "people": [
-    {
-      "github": "joshcooper",
-      "email": "josh@puppet.com",
-      "name": "Josh Cooper"
-    },
-    {
-      "github": "rick",
-      "email": "rick@puppet.com",
-      "name": "Rick Bradley"
-    }
-  ]
-}