From ee66bce30b5fbcc959901d192f50ee7d08a27d43 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Fri, 24 Oct 2025 14:55:15 +0200 Subject: [PATCH] Switch to vagrant hypervisor Working with kernel modules (autofs) and rootless podman is just to hard for acceptance tests. --- .github/workflows/ci.yml | 2 ++ .sync.yml | 3 +++ spec/acceptance/cvmfs_mount_atlas_repo_spec.rb | 3 +++ spec/acceptance/cvmfs_mount_cern_domain_spec.rb | 3 +++ spec/acceptance/cvmfs_prom_enable_spec.rb | 3 +++ 5 files changed, 14 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4467415..ba634d7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,3 +23,5 @@ jobs: puppet: name: Puppet uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v3 + with: + beaker_hypervisor: 'vagrant_libvirt' diff --git a/.sync.yml b/.sync.yml index 5d21319..d84b521 100644 --- a/.sync.yml +++ b/.sync.yml @@ -1,3 +1,6 @@ --- spec/spec_helper_acceptance.rb: unmanaged: false + +.github/workflows/ci.yml: + beaker_hypervisor: vagrant_libvirt diff --git a/spec/acceptance/cvmfs_mount_atlas_repo_spec.rb b/spec/acceptance/cvmfs_mount_atlas_repo_spec.rb index ee4e9db..490c6ab 100644 --- a/spec/acceptance/cvmfs_mount_atlas_repo_spec.rb +++ b/spec/acceptance/cvmfs_mount_atlas_repo_spec.rb @@ -4,6 +4,9 @@ describe 'cvmfs::mount atlas.cern.ch' do it 'configures and work with no errors' do + pending('vargrant image being available') if ((fact('os.name') == 'Rocky') && (fact('os.release.major') == '9')) || + ((fact('os.name') == 'Ubuntu') && (fact('os.release.major') == '24.04')) + shell('cvmfs_config killall', acceptable_exit_codes: [0, 127]) pp = <<-EOS class{"cvmfs": diff --git a/spec/acceptance/cvmfs_mount_cern_domain_spec.rb b/spec/acceptance/cvmfs_mount_cern_domain_spec.rb index f3f158d..58bd4b9 100644 --- a/spec/acceptance/cvmfs_mount_cern_domain_spec.rb +++ b/spec/acceptance/cvmfs_mount_cern_domain_spec.rb @@ -4,6 +4,9 @@ describe 'cvmfs::domain cern.ch' do it 'configures and work with no errors' do + pending('vargrant image being available') if ((fact('os.name') == 'Rocky') && (fact('os.release.major') == '9')) || + ((fact('os.name') == 'Ubuntu') && (fact('os.release.major') == '24.04')) + # Clean up all existing mounts shell('cvmfs_config killall', acceptable_exit_codes: [0, 127]) pp = <<-EOS diff --git a/spec/acceptance/cvmfs_prom_enable_spec.rb b/spec/acceptance/cvmfs_prom_enable_spec.rb index adece42..23cb068 100644 --- a/spec/acceptance/cvmfs_prom_enable_spec.rb +++ b/spec/acceptance/cvmfs_prom_enable_spec.rb @@ -4,6 +4,9 @@ describe 'cvmfs enable_prometheus_exporter' do it 'configures and work with no errors' do + pending('vargrant image being available') if ((fact('os.name') == 'Rocky') && (fact('os.release.major') == '9')) || + ((fact('os.name') == 'Ubuntu') && (fact('os.release.major') == '24.04')) + # Clean up all existing mounts shell('cvmfs_config killall', acceptable_exit_codes: [0, 127]) pp = <<-PUPPET