Skip to content

Commit

Permalink
[chef] add debian 12 testing (#4041)
Browse files Browse the repository at this point in the history
* [chef] add debian 12 testing

* do not install fluentd for debian-12
  • Loading branch information
atoulme authored Dec 14, 2023
1 parent 82f3a78 commit a95e05a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
7 changes: 7 additions & 0 deletions deployments/chef/kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,13 @@ platforms:
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro

- name: debian-12
driver:
image: dokken/debian-12
pid_one_command: /bin/systemd
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro

- name: opensuse-12
driver:
image: opensuse/leap:42
Expand Down
2 changes: 1 addition & 1 deletion deployments/chef/recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
end

if node['splunk_otel_collector']['with_fluentd'].to_s.downcase == 'true'
if platform_family?('debian')
if platform_family?('debian') && node['platform_version'].to_i < 12
include_recipe 'splunk_otel_collector::fluentd_deb_repo'
include_recipe 'splunk_otel_collector::fluentd_linux_install'
elsif platform_family?('rhel', 'amazon')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
its('content') { should match /^User=custom-user$/ }
its('content') { should match /^Group=custom-group$/ }
end
if os[:family] != 'suse' && os[:family] != 'opensuse'
if os[:family] != 'suse' && os[:family] != 'opensuse' && !(os[:family] == 'debian' && ::Gem::Version.new(os.release) >= ::Gem::Version.new('12'))
fluentd_config_path = '/etc/otel/collector/fluentd/fluent.conf'
describe service('td-agent') do
it { should be_enabled }
Expand Down

0 comments on commit a95e05a

Please sign in to comment.