Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions .sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 1 addition & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down