Skip to content

Commit 4569b5b

Browse files
kanard38knard38
authored andcommitted
DAOS-18827 build: Update remaining Ubuntu 22.04 references to 24.04
- Update landing-builds.yml GHA workflow to use ubuntu:24.04 as BASE_DISTRO - Add Ubuntu 24.04 case to ci/parse_ci_envs.sh - Add ubuntu-24.04 test case and fixture to distribution_test.go - Add ubuntu24.04-os-rel fixture file to distros directory Signed-off-by: Cedric Koch-Hofer <cedric.koch-hofer@hpe.com>
1 parent caa8559 commit 4569b5b

4 files changed

Lines changed: 32 additions & 1 deletion

File tree

.github/workflows/landing-builds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ jobs:
249249
with: rockylinux/rockylinux:8
250250
- distro: ubuntu
251251
base: ubuntu
252-
with: ubuntu:22.04
252+
with: ubuntu:24.04
253253
env:
254254
DEPS_JOBS: 10
255255
BASE_DISTRO: ${{ matrix.with }}

ci/parse_ci_envs.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,11 @@ if [ -n "${STAGE_NAME:?}" ]; then
5353
: "${TARGET:=ubuntu22}"
5454
: "${REPO_SPEC:=ubuntu-22.04}"
5555
;;
56+
*Ubuntu\ 24.04*|*ubuntu2404*)
57+
: "${CHROOT_NAME:="not_applicable"}"
58+
: "${TARGET:=ubuntu24}"
59+
: "${REPO_SPEC:=ubuntu-24.04}"
60+
;;
5661
esac
5762
fi
5863
export CHROOT_NAME

src/control/provider/system/distribution_test.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
//
22
// (C) Copyright 2021-2022 Intel Corporation.
3+
// (C) Copyright 2026 Hewlett Packard Enterprise Development LP
34
//
45
// SPDX-License-Identifier: BSD-2-Clause-Patent
56
//
@@ -97,6 +98,19 @@ func TestSystem_getDistribution(t *testing.T) {
9798
},
9899
},
99100
},
101+
"ubuntu-24.04": {
102+
fileMap: map[string]string{
103+
"/etc/os-release": "distros/ubuntu24.04-os-rel",
104+
},
105+
expDist: Distribution{
106+
ID: "ubuntu",
107+
Name: "Ubuntu",
108+
Version: DistributionVersion{
109+
Major: 24,
110+
Minor: 4,
111+
},
112+
},
113+
},
100114
"opensuse-15.2": {
101115
fileMap: map[string]string{
102116
"/etc/os-release": "distros/opensuse15.2-os-rel",
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
NAME="Ubuntu"
2+
VERSION="24.04.2 LTS (Noble Numbat)"
3+
ID=ubuntu
4+
ID_LIKE=debian
5+
PRETTY_NAME="Ubuntu 24.04.2 LTS"
6+
VERSION_ID="24.04"
7+
HOME_URL="https://www.ubuntu.com/"
8+
SUPPORT_URL="https://help.ubuntu.com/"
9+
BUG_REPORT_URL="https://bugs.launchpad.net/ubuntu/"
10+
PRIVACY_POLICY_URL="https://www.ubuntu.com/legal/terms-and-policies/privacy-policy"
11+
UBUNTU_CODENAME=noble
12+
VERSION_CODENAME=noble

0 commit comments

Comments
 (0)