beaker-abs 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d93cecbcd15eecf0a2e91a03ee22c650c0a3e99e0dabf4eeb42ec237b5b7e4c3
-  data.tar.gz: 57cffc12ea0a3b228ea3c32077cee07756ad8dfe44dbdd4c61d21bbb7893802e
+  metadata.gz: f8435e87c6355cd2a8ae1f61b6bbdf65fddfc9f6c58e112e4aee1f9524e37a1f
+  data.tar.gz: de010987d68324aae08368c0a048016e924bfd3daa9121dfa6aea6ca4fcff0f1
 SHA512:
-  metadata.gz: 9625cf00e154313234fc17b791df2279c39d8ee42fa4da402523354d9d361694d26318c861296dcd17bbab2e574045559faea608466d20af360895677ea9d2c5
-  data.tar.gz: 418cf2305cd0aaa582b2acd0447349b01f0d828a5ddd740731464193878276733ef2d756b53c805eb47e323877427d0aa458f9ee16509c3aaffb74b8a3c8fe4f
+  metadata.gz: 793b31558dd6c9a2a1056c3804ceeff526edf0f1c0e1921aa99b3164aea6fb4de339732f95c4816859f77545f1c2cd82b58595139f6345bf3449d2e467366a71
+  data.tar.gz: 23112d30fa46e9c2ccd34d131b3e00b391d96d26f9e90381467e916e8fa4ad89c3175aa16e937f5c1905f992462b86770287952e5e2e5d7de3d5214db798795b

data/.github/workflows/auto_release_prep.yml

@@ -0,0 +1,12 @@
+name: Automated release prep
+
+on:
+  workflow_dispatch:
+
+jobs:
+  auto_release_prep:
+    uses: puppetlabs/release-engineering-repo-standards/.github/workflows/auto_release_prep.yml@v1
+    secrets: inherit
+    with:
+      project-type: ruby
+      version-file-path: lib/beaker-abs/version.rb

data/.github/workflows/dependabot_merge.yml

@@ -0,0 +1,8 @@
+name: Dependabot auto-merge
+
+on: pull_request
+
+jobs:
+  dependabot_merge:
+    uses: puppetlabs/release-engineering-repo-standards/.github/workflows/dependabot_merge.yml@v1
+    secrets: inherit

data/.github/workflows/ensure_label.yml

@@ -0,0 +1,8 @@
+name: Ensure label
+
+on: pull_request
+
+jobs:
+  ensure_label:
+    uses: puppetlabs/release-engineering-repo-standards/.github/workflows/ensure_label.yml@v1
+    secrets: inherit

data/.github/workflows/release.yml

@@ -10,7 +10,7 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         ref: ${{ github.ref }}
         clean: true
@@ -24,7 +24,7 @@ jobs:
         echo "Found version $version from lib/beaker-abs/version.rb"
 
     - name: Get Current Version
-      uses: actions/github-script@v6
+      uses: actions/github-script@v7
       id: cv
       with:
         script: |

data/.github/workflows/security.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: checkout repo content
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 1
     - name: setup ruby
@@ -22,7 +22,7 @@ jobs:
     - name: check lock
       run: '[ -f "Gemfile.lock" ] && echo "package lock file exists, skipping" || bundle lock'
     # install java
-    - uses: actions/setup-java@v3
+    - uses: actions/setup-java@v4
       with:
         distribution: 'temurin' # See 'Supported distributions' for available options
         java-version: '17'

data/.github/workflows/testing.yml

@@ -16,7 +16,7 @@ jobs:
           - '3.1'
           - '3.2'
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/CHANGELOG.md

@@ -1,5 +1,32 @@
 # Changelog
 
+## [1.2.0](https://github.com/puppetlabs/beaker-abs/tree/1.2.0) (2026-08-03)
+
+[Full Changelog](https://github.com/puppetlabs/beaker-abs/compare/1.1.0...1.2.0)
+
+**Fixed bugs:**
+
+- \(PA-8450\) Fix beaker destroy when ABS\_RESOURCE\_HOSTS is unset [\#49](https://github.com/puppetlabs/beaker-abs/pull/49) ([joshcooper](https://github.com/joshcooper))
+
+**Merged pull requests:**
+
+- \(PA-9008\) Allow beaker 7 [\#51](https://github.com/puppetlabs/beaker-abs/pull/51) ([shubhamshinde360](https://github.com/shubhamshinde360))
+
+## [1.1.0](https://github.com/puppetlabs/beaker-abs/tree/1.1.0) (2024-05-28)
+
+[Full Changelog](https://github.com/puppetlabs/beaker-abs/compare/1.0.0...1.1.0)
+
+**Fixed bugs:**
+
+- Fix minitest after 5.19.0 [\#36](https://github.com/puppetlabs/beaker-abs/pull/36) ([yachub](https://github.com/yachub))
+
+**Merged pull requests:**
+
+- Add support for Beaker 6 [\#41](https://github.com/puppetlabs/beaker-abs/pull/41) ([mhashizume](https://github.com/mhashizume))
+- Bump actions/setup-java from 3 to 4 [\#38](https://github.com/puppetlabs/beaker-abs/pull/38) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump actions/github-script from 6 to 7 [\#37](https://github.com/puppetlabs/beaker-abs/pull/37) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump actions/checkout from 3 to 4 [\#35](https://github.com/puppetlabs/beaker-abs/pull/35) ([dependabot[bot]](https://github.com/apps/dependabot))
+
 ## [1.0.0](https://github.com/puppetlabs/beaker-abs/tree/1.0.0) (2023-03-28)
 
 [Full Changelog](https://github.com/puppetlabs/beaker-abs/compare/0.11.0...1.0.0)
@@ -90,7 +117,7 @@
 
 **Merged pull requests:**
 
-- \(QENG-6081\) Remove beaker dependency [\#10](https://github.com/puppetlabs/beaker-abs/pull/10) ([smcelmurry](https://github.com/smcelmurry))
+- \(QENG-6081\) Remove beaker dependency [\#10](https://github.com/puppetlabs/beaker-abs/pull/10) ([junebug-spencer](https://github.com/junebug-spencer))
 
 ## [0.3.0](https://github.com/puppetlabs/beaker-abs/tree/0.3.0) (2017-08-14)
 

data/Gemfile

@@ -14,5 +14,5 @@ def location_for(place, fake_version = nil)
 end
 
 group :testing do
-  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 5.0')
+  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '>= 5.0', '< 8')
 end

data/beaker-abs.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "beaker", "~> 5.0"
+  spec.add_dependency "beaker", ">= 5.0", "< 8"
   spec.add_dependency "vmfloaty", ">= 1.0", "< 2"
   # accept more keys, for smallstep integration
   spec.add_dependency 'ed25519', ">= 1.2", "< 2.0"

data/lib/beaker/hypervisor/abs.rb

@@ -39,9 +39,7 @@ module Beaker
       @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)
+      @resource_hosts = resource_hosts ? JSON.parse(resource_hosts) : []
     end
 
     def connection_preference(host)
@@ -65,6 +63,11 @@ module Beaker
     end
 
     def provision
+      if @resource_hosts.empty? && !@hosts.empty?
+        raise ArgumentError, "ABS_RESOURCE_HOSTS must be specified when using the Beaker::Abs hypervisor" unless @options[:provision]
+        @resource_hosts = JSON.parse(provision_vms(@hosts).to_json)
+      end
+
       type2hosts = {}
 
       # Each resource_host is of the form:
@@ -104,7 +107,22 @@ module Beaker
     end
 
     def cleanup
-      # nothing to do
+      return if ENV['ABS_RESOURCE_HOSTS'] || @options[:abs_resource_hosts]
+
+      hostnames = @hosts.map(&:hostname)
+      return if hostnames.empty?
+
+      verbose = false
+      config = Conf.read_config
+      cli = Clifloaty.new(@abs_service_name, @abs_service_priority)
+      abs_service = Service.new(cli, config)
+      abs_service.delete(verbose, hostnames).each_pair do |hostname, result|
+        if result['ok']
+          @logger.info("Destroyed #{hostname}")
+        else
+          @logger.warn("Failed to destroy #{hostname}")
+        end
+      end
     end
 
     def provision_vms(hosts)

data/lib/beaker-abs/version.rb

@@ -1,5 +1,5 @@
 module BeakerAbs
   module Version
-    STRING = '1.0.0'
+    STRING = '1.2.0'
   end
 end

data/release-prep

@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 
 # bundle install
-docker run -it --rm \
+docker run -t --rm \
   -v $(pwd):/app \
   ruby:3.2-slim-bullseye \
   /bin/bash -c 'apt-get update -qq && apt-get install -y --no-install-recommends build-essential git make && cd /app && gem install bundler && bundle install --jobs 3; echo "LOCK_FILE_UPDATE_EXIT_CODE=$?"'
 
 # Update Changelog
-docker run -it --rm -e CHANGELOG_GITHUB_TOKEN -v $(pwd):/usr/local/src/your-app \
+docker run -t --rm -e CHANGELOG_GITHUB_TOKEN -v $(pwd):/usr/local/src/your-app \
   githubchangeloggenerator/github-changelog-generator:1.16.2 \
   github_changelog_generator --future-release $(grep STRING lib/beaker-abs/version.rb |rev |cut -d "'" -f2 |rev)

metadata

@@ -1,30 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: beaker-abs
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Josh Cooper
 - Rick Bradley
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-28 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: vmfloaty
   requirement: !ruby/object:Gem::Requirement
@@ -137,6 +142,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/dependabot.yml"
+- ".github/workflows/auto_release_prep.yml"
+- ".github/workflows/dependabot_merge.yml"
+- ".github/workflows/ensure_label.yml"
 - ".github/workflows/release.yml"
 - ".github/workflows/security.yml"
 - ".github/workflows/testing.yml"
@@ -158,7 +166,6 @@ homepage: https://github.com/puppetlabs/beaker-abs
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -173,8 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key: 
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Let's test Puppet, using hosts provisioned by Always Be Scheduling service.
 test_files: []