diff --git a/.sync.yml b/.sync.yml index 35cbf42..b2bad31 100644 --- a/.sync.yml +++ b/.sync.yml @@ -17,29 +17,18 @@ Gemfile: from_env: BEAKER_HOSTGENERATOR_VERSION - gem: beaker-rspec from_env: BEAKER_RSPEC_VERSION - # Prevent beaker-puppet from being installed on Ruby > 3.1 until beaker-puppet supports newer Rubies (PA-6136) - gem: beaker-puppet from_env: BEAKER_PUPPET_VERSION version: '~> 4.0' - condition: Gem::Requirement.create('< 3.2.0').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) - # We can unpin async when we move to Ruby 3 - - gem: async - version: '~> 1' - gem: beaker-module_install_helper - gem: nokogiri ":system_tests": - gem: voxpupuli-acceptance -appveyor.yml: - delete: true -.travis.yml: - delete: true .github/workflows/release.yml: unmanaged: false .github/workflows/release_prep.yml: unmanaged: false -.gitlab-ci.yml: - delete: true # We still use the Vox acceptance Rake task instead of Litmus Rakefile: requires: diff --git a/Gemfile b/Gemfile index 06fbaa1..577edbd 100644 --- a/Gemfile +++ b/Gemfile @@ -61,8 +61,7 @@ group :development do gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 1.0') gem "beaker-hostgenerator" gem "beaker-rspec" - gem "beaker-puppet", *location_for(ENV['BEAKER_PUPPET_VERSION'] || '~> 4.0') if Gem::Requirement.create('< 3.2.0').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) - gem "async", '~> 1', require: false + gem "beaker-puppet", *location_for(ENV['BEAKER_PUPPET_VERSION'] || '~> 4.0') gem "beaker-module_install_helper", require: false gem "nokogiri", require: false end diff --git a/metadata.json b/metadata.json index 669d135..8d3c35f 100644 --- a/metadata.json +++ b/metadata.json @@ -10,7 +10,7 @@ "dependencies": [ { "name": "puppetlabs/zfs_core", - "version_requirement": ">= 1.0.0 < 2.0.0" + "version_requirement": ">= 1.0.0 < 3.0.0" } ], "operatingsystem_support": [