Skip to content

Commit 57cc873

Browse files
authored
[chore][chef]Set with_fluentd to false for debian-11 tests (#6287)
* [chore][chef]Set `with_fluentd` to false for debian-11 tests * Adjust test on debian-11
1 parent ce02a29 commit 57cc873

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

.github/workflows/chef-test.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,13 @@ jobs:
9393
with:
9494
version: ${{ env.CHEF_VERSION }}
9595

96+
97+
# Install of fluentd is failing on Debian 11, so we disable it for that distro.
98+
- name: Set `with_fluentd` to false on Debian 11
99+
if: matrix.DISTRO == 'debian-11'
100+
run: |
101+
yq eval '(.suites[] | select(.name=="custom_vars").attributes.splunk_otel_collector.with_fluentd) = false' -i kitchen.yml
102+
96103
- run: kitchen test ${{ matrix.DISTRO }}
97104

98105
- uses: actions/upload-artifact@v4

deployments/chef/test/integration/custom_vars/test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
its('content') { should match /^User=custom-user$/ }
7171
its('content') { should match /^Group=custom-group$/ }
7272
end
73-
if os[:family] != 'suse' && os[:family] != 'opensuse' && !(os[:family] == 'debian' && ::Gem::Version.new(os.release) >= ::Gem::Version.new('12'))
73+
if os[:family] != 'suse' && os[:family] != 'opensuse' && !(os[:family] == 'debian' && ::Gem::Version.new(os.release) >= ::Gem::Version.new('11'))
7474
fluentd_config_path = '/etc/otel/collector/fluentd/fluent.conf'
7575
describe service('td-agent') do
7676
it { should be_enabled }

0 commit comments

Comments
 (0)