From 97f5ad54aee740a8f30fb81d042ef611b1bbf91a Mon Sep 17 00:00:00 2001 From: Peder Pedersen Date: Wed, 8 Jan 2025 15:28:04 +0000 Subject: [PATCH 1/2] this change is to change the file name of the debian packer after version 9.4.0 it was: -linux-2.6- if needs to be: -linux- --- manifests/params.pp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/manifests/params.pp b/manifests/params.pp index a10d7819..c63628dd 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -313,6 +313,13 @@ default: { $package_provider = undef } # Don't define a $package_provider } + # Download URLs changed starting from 9.4.0 for debs. + # Splunk only includes "-linux-". + if versioncmp($version, '9.4.0') >= 0 { + $deb_prefix = 'linux' + } else { + $deb_prefix = 'linux-2.6' + } # Download URLs changed starting from 8.2.11 and 9.0.5 for RPMs. # Splunk no longer includes "-linux-2.6-". $linux_prefix = (versioncmp($version, '9.0.5') >= 0 or (versioncmp($version, '8.2.11') >= 0 and versioncmp($version, '9.0.0') == -1)) ? { @@ -348,7 +355,7 @@ $enterprise_package_name = 'splunk' } 'Debian amd64': { - $package_suffix = "${version}-${build}-linux-2.6-amd64.deb" + $package_suffix = "${version}-${build}-${deb_prefix}-amd64.deb" $forwarder_package_name = 'splunkforwarder' $enterprise_package_name = 'splunk' } From 4ec8fb8e3fcbd22a2b3799f5edd29c6c59c7c4f1 Mon Sep 17 00:00:00 2001 From: Peder Pedersen Date: Thu, 9 Jan 2025 10:37:55 +0000 Subject: [PATCH 2/2] add the 9.4.0 and checksum to the test unit --- spec/spec_helper_acceptance.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index a2efa3aa..91d27c5a 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -6,6 +6,7 @@ OLD_SPLUNK_VERSIONS = [ ['7.2.4.2', 'fb30470262e3'], ['9.0.0', '6818ac46f2ec'], + ['9.4.0', '6b4ebe426ca6'], ].freeze configure_beaker do |host|