Skip to content

Commit

Permalink
(CAT-2101) Add support for Debian-12
Browse files Browse the repository at this point in the history
 - Update container-tools package.
 - Skip docker plugin tests for aarch architecture as the plugin ''vieux/sshfs' is not properly supported for aarch.
  • Loading branch information
shubhamshinde360 committed Oct 30, 2024
1 parent 5a0775b commit 0c051fc
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .fixtures.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ fixtures:
facts: 'https://github.com/puppetlabs/puppetlabs-facts.git'
puppet_agent:
repo: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
ref: v4.13.0
ref: v4.21.0
provision: 'https://github.com/puppetlabs/provision.git'
yumrepo_core:
repo: https://github.com/puppetlabs/puppetlabs-yumrepo_core.git
Expand Down
3 changes: 2 additions & 1 deletion metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
"operatingsystemrelease": [
"18.04",
"20.04",
"22.04"
"22.04",
"24.04"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/plugin_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
docker_args = ''
end

describe 'docker plugin', win_broken: broken do
describe 'docker plugin', win_broken: broken, skip: is_aarch? do
before(:all) do
install_code = "class { 'docker': #{docker_args}}"
apply_manifest(install_code, catch_failures: true)
Expand Down
6 changes: 5 additions & 1 deletion spec/spec_helper_acceptance_local.rb
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ def fetch_puppet_version
@fetch_puppet_version ||= run_shell('puppet --version').stdout.to_i
end

def is_aarch?
os[:arch].include?('aarch')
end

RSpec.configure do |c|
# Add exclusive filter for Windows untill all the windows functionality is implemented
c.filter_run_excluding win_broken: true
Expand All @@ -65,7 +69,7 @@ def fetch_puppet_version
# run_shell('apt-get upgrade -y')
run_shell('apt-get install -y lsb-release')
run_shell('apt-get install -y net-tools')
run_shell('apt-get purge -y container-tools') if ENV['CI']
run_shell('apt-get purge -y open-infrastructure-container-tools') if ENV['CI']
end

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

0 comments on commit 0c051fc

Please sign in to comment.