Skip to content

Commit 651c427

Browse files
committed
use voxpupuli acceptance to support newer OSes
1 parent 60b22c7 commit 651c427

13 files changed

Lines changed: 7 additions & 47 deletions

Gemfile

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,7 @@ group :development do
2424
gem "puppet-strings", require: false
2525
end
2626
group :system_tests do
27-
gem "beaker", require: false
28-
gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')
29-
gem "beaker-pe", require: false
30-
gem "beaker-hostgenerator"
31-
gem "beaker-rspec"
32-
gem "beaker-docker", require: false
33-
gem "beaker-puppet", git: 'https://github.com/puppetlabs/beaker-puppet.git', ref: '6063d22b6c4449df795731f5853c3c75241240c4'
34-
gem "beaker-puppet_install_helper", require: false
35-
gem "beaker-module_install_helper", require: false
27+
gem 'voxpupuli-acceptance', '~> 4.4.0', require: false
3628
end
3729

3830
puppet_version = ENV['PUPPET_GEM_VERSION']

Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require 'puppetlabs_spec_helper/rake_tasks'
44
require 'puppet-syntax/tasks/puppet-syntax'
5-
require 'beaker-rspec/rake_task' if Bundler.rubygems.find_name('beaker-rspec').any?
5+
require 'voxpupuli/acceptance/rake' if Bundler.rubygems.find_name('voxpupuli-acceptance').any?
66
require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
77
require 'github_changelog_generator/task' if Bundler.rubygems.find_name('github_changelog_generator').any?
88
require 'puppet-strings/tasks' if Bundler.rubygems.find_name('puppet-strings').any?

spec/acceptance/nodesets/amazon2023.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ HOSTS:
1616
- LANGUAGE=en_US.UTF-8
1717
- LC_ALL=en_US.UTF-8
1818
docker_container_name: 'openondemand-amazon2023'
19-
default_module_install_opts:
20-
ignore-dependencies:
21-
force:
2219
CONFIG:
2320
log_level: debug
2421
type: foss

spec/acceptance/nodesets/debian-12.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ HOSTS:
1919
- LANGUAGE=en_US.UTF-8
2020
- LC_ALL=en_US.UTF-8
2121
docker_container_name: 'openondemand-debian12'
22-
default_module_install_opts:
23-
ignore-dependencies:
24-
force:
2522
CONFIG:
2623
log_level: debug
2724
type: foss

spec/acceptance/nodesets/debian-13.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ HOSTS:
1919
- LANGUAGE=en_US.UTF-8
2020
- LC_ALL=en_US.UTF-8
2121
docker_container_name: 'openondemand-debian13'
22-
default_module_install_opts:
23-
ignore-dependencies:
24-
force:
2522
CONFIG:
2623
log_level: debug
2724
type: foss

spec/acceptance/nodesets/el10.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ HOSTS:
1717
- LANGUAGE=en_US.UTF-8
1818
- LC_ALL=en_US.UTF-8
1919
docker_container_name: 'openondemand-el10'
20-
default_module_install_opts:
21-
ignore-dependencies:
22-
force:
2320
CONFIG:
2421
log_level: debug
2522
type: foss

spec/acceptance/nodesets/el8.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ HOSTS:
1717
- LANGUAGE=en_US.UTF-8
1818
- LC_ALL=en_US.UTF-8
1919
docker_container_name: 'openondemand-el8'
20-
default_module_install_opts:
21-
ignore-dependencies:
22-
force:
2320
CONFIG:
2421
log_level: debug
2522
type: foss

spec/acceptance/nodesets/el9.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ HOSTS:
1717
- LANGUAGE=en_US.UTF-8
1818
- LC_ALL=en_US.UTF-8
1919
docker_container_name: 'openondemand-el9'
20-
default_module_install_opts:
21-
ignore-dependencies:
22-
force:
2320
CONFIG:
2421
log_level: debug
2522
type: foss

spec/acceptance/nodesets/ubuntu-2204.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ HOSTS:
1616
- LANGUAGE=en_US.UTF-8
1717
- LC_ALL=en_US.UTF-8
1818
docker_container_name: 'openondemand-ubuntu2204'
19-
default_module_install_opts:
20-
ignore-dependencies:
21-
force:
2219
CONFIG:
2320
log_level: debug
2421
type: foss

spec/acceptance/nodesets/ubuntu-2404.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ HOSTS:
1616
- LANGUAGE=en_US.UTF-8
1717
- LC_ALL=en_US.UTF-8
1818
docker_container_name: 'openondemand-ubuntu2404'
19-
default_module_install_opts:
20-
ignore-dependencies:
21-
force:
2219
CONFIG:
2320
log_level: debug
2421
type: foss

0 commit comments

Comments
 (0)