Skip to content
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

Add/ubuntu24 #955

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add/ubuntu24 #955

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
3 changes: 2 additions & 1 deletion metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{

Check warning on line 1 in metadata.json

View workflow job for this annotation

GitHub Actions / Puppet / Static validations 

Skipping EOL operating system CentOS 8
"name": "puppet-zabbix",
"version": "10.0.1-rc0",
"summary": "Installing and maintaining Zabbix. Will install server, proxy, java-gateway and agent on RedHat/Debian/Ubuntu (Incl. exported resources).",
Expand Down Expand Up @@ -125,7 +125,8 @@
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"20.04",
"22.04"
"22.04",
"24.04"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion spec/spec_helper_methods.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def baseline_os_hash
},
{
'operatingsystem' => 'Ubuntu',
'operatingsystemrelease' => %w[20.04 22.04]
'operatingsystemrelease' => %w[20.04 22.04 24.04]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think in another PR we should remove the whole hash here. It doesn't make sense to duplicate the information from metadata.json. We did that in the past because we only had limited CI power.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes but we need to remove not supported os from metadata.json
I'm waiting centos7 EOL to think to release v11

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI: With #967 the unit tests will run much faster, so we don't need to worry about the CI runtime for unit tests.

},
{
'operatingsystem' => 'Archlinux',
Expand Down
2 changes: 1 addition & 1 deletion spec/support/acceptance/supported_versions.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def supported_server_versions(platform)
supported_versions.reject do |version|
platform.start_with?('archlinux') ||
(version >= '5.2' && platform.start_with?('el-7')) ||
(version < '6.0' && platform.start_with?('el-9', 'ubuntu-22', 'debian-12')) ||
(version < '6.0' && platform.start_with?('el-9', 'ubuntu-22', 'ubuntu-24', 'debian-12')) ||
(version >= '7.0' && platform.start_with?('ubuntu-20', 'debian-11'))
end
end