From 16a706c5fadbe4719d9980a8132222b5a040e306 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Tue, 27 Jan 2026 14:27:42 +0100 Subject: [PATCH 1/2] Add support for OpenVox --- metadata.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/metadata.json b/metadata.json index 220b41c..9364aba 100644 --- a/metadata.json +++ b/metadata.json @@ -59,6 +59,10 @@ { "name": "puppet", "version_requirement": ">= 8.0.0 < 9.0.0" + }, + { + "name": "openvox", + "version_requirement": ">= 8.23.1 < 9.0.0" } ] } From 314123b7f521f66aeb6e8222c18ef342cbe8ba91 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Tue, 27 Jan 2026 14:30:54 +0100 Subject: [PATCH 2/2] msync update --- .github/workflows/ci.yml | 3 +-- CONTRIBUTING.md | 26 +++++++++++++++++++++++++- Gemfile | 4 ++-- 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c59c035..f0a810f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,8 +17,7 @@ concurrency: jobs: puppet: name: Puppet - uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v3 + uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v4 with: - pidfile_workaround: 'false' beaker_facter: 'pulpcore_version:Pulp:nightly,3.63,3.73,3.85' rubocop: false diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a4c162f..d158a63 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -17,7 +17,7 @@ Checklist (and a short version for the impatient) description (50 characters is the soft limit, excluding ticket number(s)), and should skip the full stop. - - If you have a [https://projects.theforeman.org/projects/puppet-foreman/issues](Redmine issue) + - If you have a [Redmine issue](https://projects.theforeman.org/projects/puppet-foreman/issues) number, associate the issue in the message. The first line should start with the issue number in the form "fixes #XXXX - rest of message". [More information on the Redmine style](https://projects.theforeman.org/projects/foreman/wiki/Reviewing_patches-commit_message_format). @@ -206,6 +206,30 @@ SPEC_FACTS_OS=redhat bundle exec rspec spec/classes/foreman_spec.rb For more information on running the tests, see [rspec-puppet-facts](https://github.com/mcanevet/rspec-puppet-facts) and specifically the [section for running tests](https://github.com/mcanevet/rspec-puppet-facts#running-your-tests). +**Running acceptance tests locally** + +1. Make sure you've met Prerequisites. + +2. Acceptance tests are running within a VM, so make sure you have installed: + - `docker` **or** + - `vagrant` with `VirtualBox` as the provider **or** + - `vagrant` and `vagrant-libvirt` with `libvirt` as the provider + +For more dependencies please see related information for picked variant. +Additonal info can be found at [voxpupuli-acceptance](https://github.com/voxpupuli/voxpupuli-acceptance/#running-tests) which is used to run the tests. + +3. Run the tests: + - `BEAKER_HYPERVISOR=vagrant_libvirt bundle exec rake beaker` + - Use `bundle exec rspec spec/acceptance/my_test.rb -e "test"` to run a specific test as you'd usually do with `rspec`. + + This will use `vagrant` and `libvirt` as the provider to create a VM and will run all tests there. + +4. You can additionally specify: + - `BEAKER_PUPPET_DEBUG=yes` to make Puppet more verbose. + - `BEAKER_destroy=no` to leave the machine for further inspection in case of an error. + - Use `cd .vagrant/beaker_vagrant_files/beaker_centos8* && vagrant ssh` to SSH into VM. + - `BEAKER_provision=no` to re-use the VM again to re-run tests (e.g. small changes or new ones). + Writing Tests ------------- diff --git a/Gemfile b/Gemfile index dc219cf..c97c210 100644 --- a/Gemfile +++ b/Gemfile @@ -10,9 +10,9 @@ gem 'kafo_module_lint', {"groups"=>["test"]} gem 'puppet-lint-spaceship_operator_without_tag-check', '~> 1.0', {"groups"=>["test"]} gem 'voxpupuli-test', '~> 9.0', {"groups"=>["test"]} gem 'github_changelog_generator', '>= 1.15.0', {"groups"=>["development"]} -gem 'puppet_metadata', '~> 4.0' +gem 'puppet_metadata', '~> 5.3' gem 'puppet-blacksmith', '>= 6.0.0', {"groups"=>["development"]} -gem 'voxpupuli-acceptance', '~> 3.4', {"groups"=>["system_tests"]} +gem 'voxpupuli-acceptance', '~> 4.1', {"groups"=>["system_tests"]} gem 'puppetlabs_spec_helper', {"groups"=>["system_tests"]} # vim:ft=ruby