Skip to content

Commit 843ee06

Browse files
(CAT-2101) Add support for Debian 12
- Update container-tools package. - Skip docker plugin tests for aarch architecture as the plugin ''vieux/sshfs' is not properly supported for aarch.
1 parent 5a0775b commit 843ee06

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

.fixtures.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ fixtures:
88
facts: 'https://github.com/puppetlabs/puppetlabs-facts.git'
99
puppet_agent:
1010
repo: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
11-
ref: v4.13.0
11+
ref: v4.21.0
1212
provision: 'https://github.com/puppetlabs/provision.git'
1313
yumrepo_core:
1414
repo: https://github.com/puppetlabs/puppetlabs-yumrepo_core.git

spec/acceptance/plugin_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
docker_args = ''
1414
end
1515

16-
describe 'docker plugin', win_broken: broken do
16+
describe 'docker plugin', win_broken: broken, skip: is_aarch? do
1717
before(:all) do
1818
install_code = "class { 'docker': #{docker_args}}"
1919
apply_manifest(install_code, catch_failures: true)

spec/spec_helper_acceptance_local.rb

+5-1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ def fetch_puppet_version
4646
@fetch_puppet_version ||= run_shell('puppet --version').stdout.to_i
4747
end
4848

49+
def is_aarch?
50+
os[:arch].include?('aarch')
51+
end
52+
4953
RSpec.configure do |c|
5054
# Add exclusive filter for Windows untill all the windows functionality is implemented
5155
c.filter_run_excluding win_broken: true
@@ -65,7 +69,7 @@ def fetch_puppet_version
6569
# run_shell('apt-get upgrade -y')
6670
run_shell('apt-get install -y lsb-release')
6771
run_shell('apt-get install -y net-tools')
68-
run_shell('apt-get purge -y container-tools') if ENV['CI']
72+
run_shell('apt-get purge -y open-infrastructure-container-tools') if ENV['CI']
6973
end
7074

7175
run_shell('puppet module install puppetlabs-stdlib --version 4.24.0', expect_failures: true)

0 commit comments

Comments
 (0)