From 1b096d4b90d89bed97f19ce7e6401bbc5f1c78e2 Mon Sep 17 00:00:00 2001
From: Shubham Shinde <shubham.shinde@perforce.com>
Date: Wed, 6 Nov 2024 23:33:29 +0530
Subject: [PATCH] (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.
---
 .fixtures.yml                        | 2 +-
 metadata.json                        | 3 ++-
 spec/acceptance/plugin_spec.rb       | 2 +-
 spec/spec_helper_acceptance_local.rb | 6 +++++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.fixtures.yml b/.fixtures.yml
index f812b84d..2a2cbb06 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -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
diff --git a/metadata.json b/metadata.json
index 1e8b23d0..4468efb4 100644
--- a/metadata.json
+++ b/metadata.json
@@ -45,7 +45,8 @@
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
         "10",
-        "11"
+        "11",
+        "12"
       ]
     },
     {
diff --git a/spec/acceptance/plugin_spec.rb b/spec/acceptance/plugin_spec.rb
index 7d4f1180..1b093c93 100644
--- a/spec/acceptance/plugin_spec.rb
+++ b/spec/acceptance/plugin_spec.rb
@@ -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)
diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
index 2d86750c..1860ca59 100644
--- a/spec/spec_helper_acceptance_local.rb
+++ b/spec/spec_helper_acceptance_local.rb
@@ -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
@@ -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)