diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9171d7665..3e3b02ab6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,6 +30,7 @@ jobs: - "rockylinux-9" - "ubuntu-2004" - "ubuntu-2204" + - "ubuntu-2404" suite: - "installation-script-main" - "installation-script-test" @@ -111,6 +112,8 @@ jobs: - "rockylinux-8" - "ubuntu-1804" - "ubuntu-2004" + - "ubuntu-2204" + - "ubuntu-2404" suite: - "smoke" fail-fast: false diff --git a/CHANGELOG.md b/CHANGELOG.md index 051a5d703..9fd2d1fff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +- `docker_installation_package` support for Ubuntu v24.04 (noble) + ## 11.3.7 - *2024-07-09* - Bump `docker-api` dependency to `>= 2.3` to fix [upstream bug #586](https://github.com/upserve/docker-api/issues/586) diff --git a/resources/installation_package.rb b/resources/installation_package.rb index fd2ca0501..8c1acfc8c 100644 --- a/resources/installation_package.rb +++ b/resources/installation_package.rb @@ -72,6 +72,11 @@ def jammy? false end +def noble? + return true if platform?('ubuntu') && node['platform_version'] == '24.04' + false +end + # https://github.com/chef/chef/issues/4103 def version_string(v) return if v.nil? @@ -89,6 +94,8 @@ def version_string(v) 'focal' elsif jammy? # ubuntu 22.04 'jammy' + elsif noble? # ubuntu 24.04 + 'noble' end # https://github.com/seemethere/docker-ce-packaging/blob/9ba8e36e8588ea75209d813558c8065844c953a0/deb/gen-deb-ver#L16-L20