Skip to content

Fix github system test on Ubuntu22 and 24 #3049

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hanwen-cluster merged 1 commit into from
Nov 17, 2025
Merged

Fix github system test on Ubuntu22 and 24 #3049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...lelcluster-environment/resources/cloudwatch/partial/_cloudwatch_install_package_debian.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
action :cloudwatch_install_package do
dpkg_package package_path do
source package_path
end
end unless on_docker?
end

action_class do
Expand Down
2 changes: 1 addition & 1 deletion cookbooks/aws-parallelcluster-environment/test/controls/cloudwatch_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
title "Check if cloudwatch package is installed"
describe package('amazon-cloudwatch-agent') do
it { should be_installed }
end
end unless os_properties.ubuntu_on_docker?
end

control 'tag:config_cloudwatch_configured' do
Expand Down
4 changes: 4 additions & 0 deletions cookbooks/aws-parallelcluster-shared/test/libraries/os_properties.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ def ubuntu?
inspec.os.name == 'ubuntu'
end

def ubuntu_on_docker?
on_docker? && ubuntu?
end

def redhat8?
redhat? && inspec.os.release.to_i == 8
end
Expand Down
Loading