Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(CAT-2101) Add support for Debian-12 #1001

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 @@ -45,7 +45,8 @@
"operatingsystem": "Debian",
"operatingsystemrelease": [
"10",
"11"
"11",
"12"
]
},
{
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].nil? && 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
Loading