Skip to content

DAOS-18827 build: Update Ubuntu base image to 24.04 #18044

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

Open
knard38 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

DAOS-18827 build: Update Ubuntu base image to 24.04 #18044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
caa8559
DAOS-18827 build: Update Ubuntu base image to 24.04
kanard38 Apr 20, 2026
4569b5b
DAOS-18827 build: Update remaining Ubuntu 22.04 references to 24.04
kanard38 Apr 30, 2026
0767b94
Merge remote-tracking branch 'origin/master' into ckochhof/fix/master…
kanard38 Apr 30, 2026
6462bdc
Merge remote-tracking branch 'origin/master' into ckochhof/fix/master…
kanard38 May 4, 2026
f1d93d6
Merge remote-tracking branch 'origin/master' into ckochhof/fix/master…
kanard38 May 6, 2026
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 .github/workflows/landing-builds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ jobs:
with: rockylinux/rockylinux:8
- distro: ubuntu
base: ubuntu
with: ubuntu:22.04
with: ubuntu:24.04
env:
DEPS_JOBS: 10
BASE_DISTRO: ${{ matrix.with }}
Expand Down
5 changes: 5 additions & 0 deletions ci/parse_ci_envs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ if [ -n "${STAGE_NAME:?}" ]; then
: "${TARGET:=ubuntu22}"
: "${REPO_SPEC:=ubuntu-22.04}"
;;
*Ubuntu\ 24.04*|*ubuntu2404*)
: "${CHROOT_NAME:="not_applicable"}"
: "${TARGET:=ubuntu24}"
: "${REPO_SPEC:=ubuntu-24.04}"
;;
esac
fi
export CHROOT_NAME
Expand Down
14 changes: 14 additions & 0 deletions src/control/provider/system/distribution_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
//
// (C) Copyright 2021-2022 Intel Corporation.
// (C) Copyright 2026 Hewlett Packard Enterprise Development LP
//
// SPDX-License-Identifier: BSD-2-Clause-Patent
//
Expand Down Expand Up @@ -97,6 +98,19 @@ func TestSystem_getDistribution(t *testing.T) {
},
},
},
"ubuntu-24.04": {
fileMap: map[string]string{
"/etc/os-release": "distros/ubuntu24.04-os-rel",
},
expDist: Distribution{
ID: "ubuntu",
Name: "Ubuntu",
Version: DistributionVersion{
Major: 24,
Minor: 4,
},
},
},
"opensuse-15.2": {
fileMap: map[string]string{
"/etc/os-release": "distros/opensuse15.2-os-rel",
Expand Down
12 changes: 12 additions & 0 deletions src/control/provider/system/distros/ubuntu24.04-os-rel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
NAME="Ubuntu"
VERSION="24.04.2 LTS (Noble Numbat)"
ID=ubuntu
ID_LIKE=debian
PRETTY_NAME="Ubuntu 24.04.2 LTS"
VERSION_ID="24.04"
HOME_URL="https://www.ubuntu.com/"
SUPPORT_URL="https://help.ubuntu.com/"
BUG_REPORT_URL="https://bugs.launchpad.net/ubuntu/"
PRIVACY_POLICY_URL="https://www.ubuntu.com/legal/terms-and-policies/privacy-policy"
UBUNTU_CODENAME=noble
VERSION_CODENAME=noble
4 changes: 2 additions & 2 deletions utils/docker/Dockerfile.ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Copyright 2018-2024 Intel Corporation
# Copyright 2025 Google LLC
# Copyright 2025 Hewlett Packard Enterprise Development LP
# Copyright 2025-2026 Hewlett Packard Enterprise Development LP
# All rights reserved.
#
# 'recipe' for Docker to build an image of Ubuntu-based environment for building the DAOS project.
Expand All @@ -9,7 +9,7 @@
#

# Pull base image
ARG BASE_DISTRO=ubuntu:22.04
ARG BASE_DISTRO=ubuntu:24.04
FROM $BASE_DISTRO
LABEL maintainer="daos@daos.groups.io"
# Needed for later use of BASE_DISTRO
Expand Down
Loading