Skip to content

Commit 890578d

Browse files
austbrbrw
authored andcommitted
(maint) test: support debian 12 in acceptance tests
1 parent ea6dc78 commit 890578d

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

acceptance/helper.rb

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,10 @@ def is_bullseye()
296296
return test_config[:os_families].has_key? 'debian11-64-1'
297297
end
298298

299+
def is_bookworm()
300+
return test_config[:os_families].has_key? 'debian12-64-1'
301+
end
302+
299303
def is_el8()
300304
return test_config[:os_families].has_key?('redhat8-64-1') ||
301305
test_config[:os_families].has_key?('centos8-64-1')
@@ -340,7 +344,11 @@ def puppet_repo_version(platform_version, install_type, nightly)
340344
# always use the non-nightly version to install released packages
341345
sanitized_version
342346
when :upgrade_oldest
343-
:puppet7
347+
if is_bookworm
348+
:puppet8
349+
else
350+
:puppet7
351+
end
344352
end
345353
end
346354

@@ -353,6 +361,8 @@ def oldest_supported
353361
'7.14.0'
354362
elsif is_bullseye
355363
'7.9.0'
364+
elsif is_bookworm
365+
'8.8.0'
356366
else
357367
'7.3.1'
358368
end
@@ -426,6 +436,8 @@ def get_package_version(host, version = nil)
426436
"#{version}buster"
427437
elsif host['platform'].include?('debian-11')
428438
"#{version}bullseye"
439+
elsif host['platform'].include?('debian-12')
440+
"#{version}bookworm"
429441
else
430442
raise ArgumentError, "Unsupported platform: '#{host['platform']}'"
431443
end

acceptance/setup/pre_suite/05_clear_firewalls.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
unless (test_config[:skip_presuite_provisioning])
22
step "Flushing iptables chains" do
33
hosts.each do |host|
4-
on host, 'apt-get install -y iptables' if is_bullseye
4+
on host, 'apt-get install -y iptables' if (is_bullseye || is_bookworm)
55
on host, "iptables -F INPUT -t filter"
66
on host, "iptables -F FORWARD -t filter"
77
end

0 commit comments

Comments
 (0)