diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 06b1506..45e1ec5 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -18,6 +18,7 @@ jobs: - el9 - ubuntu-20.04 - ubuntu-22.04 + - ubuntu-24.04 - debian-12 - amzn2023 arch: @@ -31,6 +32,8 @@ jobs: arch: ppc64le - dist: ubuntu-22.04 arch: ppc64le + - dist: ubuntu-24.04 + arch: ppc64le runs-on: ${{ matrix.os }} name: Buildbox tests steps: @@ -175,6 +178,7 @@ jobs: dist: - ubuntu-20.04 - ubuntu-22.04 + - ubuntu-24.04 - debian-12 arch: - x86_64 @@ -247,6 +251,7 @@ jobs: - el9 - ubuntu-20.04 - ubuntu-22.04 + - ubuntu-24.04 - debian-12 - amzn2023 arch: @@ -273,6 +278,8 @@ jobs: arch: ppc64le - dist: ubuntu-22.04 arch: ppc64le + - dist: ubuntu-24.04 + arch: ppc64le runs-on: ${{ matrix.os }} name: Package ${{ matrix.package }} dist=${{ matrix.dist }} arch=${{ matrix.arch }} steps: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ff071db..827fd5d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -16,6 +16,7 @@ jobs: - amzn2023 - ubuntu-20.04 - ubuntu-22.04 + - ubuntu-24.04 - debian-12 arch: - x86_64 @@ -28,6 +29,8 @@ jobs: arch: ppc64le - dist: ubuntu-22.04 arch: ppc64le + - dist: ubuntu-24.04 + arch: ppc64le name: Release buildbox runs-on: ubuntu-latest steps: diff --git a/Gemfile.lock b/Gemfile.lock index ea55890..b3d1d7f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - ood_packaging (0.14.1) + ood_packaging (0.15.0) rake (~> 13.0.1) GEM diff --git a/lib/ood_packaging/build_box.rb b/lib/ood_packaging/build_box.rb index da1089b..c924eef 100644 --- a/lib/ood_packaging/build_box.rb +++ b/lib/ood_packaging/build_box.rb @@ -14,6 +14,7 @@ class OodPackaging::BuildBox 'el9' => 'almalinux:9', 'ubuntu-20.04' => 'ubuntu:20.04', 'ubuntu-22.04' => 'ubuntu:22.04', + 'ubuntu-24.04' => 'ubuntu:24.04', 'debian-12' => 'debian:12', 'amzn2023' => 'amazonlinux:2023' }.freeze @@ -21,6 +22,7 @@ class OodPackaging::BuildBox CODENAMES = { 'ubuntu-20.04' => 'focal', 'ubuntu-22.04' => 'jammy', + 'ubuntu-24.04' => 'noble', 'debian-12' => 'bookworm' }.freeze diff --git a/lib/ood_packaging/version.rb b/lib/ood_packaging/version.rb index 91616bc..b07910f 100644 --- a/lib/ood_packaging/version.rb +++ b/lib/ood_packaging/version.rb @@ -2,7 +2,7 @@ # Version code for OodPackaging module OodPackaging - VERSION = '0.14.1' + VERSION = '0.15.0' PACKAGE_VERSION = { 'ondemand-release' => { '(ubuntu|debian)' => '3.1.1', diff --git a/release.py b/release.py index 9219119..1b110ce 100755 --- a/release.py +++ b/release.py @@ -21,6 +21,7 @@ 'ubuntu-18.04': 'bionic', 'ubuntu-20.04': 'focal', 'ubuntu-22.04': 'jammy', + 'ubuntu-24.04': 'noble', 'debian-12': 'bookworm', } PROJ_ROOT = os.path.dirname(os.path.realpath(__file__)) diff --git a/repo-update.sh b/repo-update.sh index cbe0418..ed5841b 100755 --- a/repo-update.sh +++ b/repo-update.sh @@ -102,6 +102,9 @@ LOCK_FILE="/var/lib/oodpkg/repo-update-${LOCK_NAME}.lock" debian-12|bookworm) DIST="bookworm" ;; + ubuntu-24.04|noble) + DIST="noble" + ;; ubuntu-22.04|jammy) DIST="jammy" ;; diff --git a/sync-release.py b/sync-release.py index 370b7f3..fe9838e 100755 --- a/sync-release.py +++ b/sync-release.py @@ -20,6 +20,7 @@ 'amzn2023', 'ubuntu-20.04', 'ubuntu-22.04', + 'ubuntu-24.04', 'debian-12' ] EL_RELEASES = [ @@ -32,6 +33,7 @@ DEB_CODENAMES = [ 'focal', 'jammy', + 'noble', 'bookworm' ] SKIP = [