Skip to content

Commit 4ed6a28

Browse files
committed
1 parent 649bfd2 commit 4ed6a28

File tree

8 files changed

+16
-111
lines changed

8 files changed

+16
-111
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ projects.
2929

3030
## System Requirements
3131

32-
This framework is intended to be run on an Ubuntu 20.04 system with some basic
32+
This framework is intended to be run on an Ubuntu 24.04 system with some basic
3333
developer packages installed, such as git, and passwordless sudo enabled. Note
3434
that it will automatically install various build-dependencies on the system, so
3535
as a safety precaution it is currently restricted to only run on an AWS instance

default-package-config.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ function kernel_update_upstream() {
262262
local tag_prefix_flavour
263263
case "${platform}" in
264264
generic)
265-
if [[ "$UBUNTU_DISTRIBUTION" == focal ]]; then
265+
if [[ "$UBUNTU_DISTRIBUTION" == noble ]]; then
266266
tag_prefix_flavour="Ubuntu-hwe"
267267
else
268268
tag_prefix_flavour="Ubuntu"

lib/common.sh

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export SUPPORTED_KERNEL_FLAVORS="generic aws gcp azure oracle"
2828
#
2929
export JENKINS_OPS_DIR="${JENKINS_OPS_DIR:-jenkins-ops}"
3030

31-
export UBUNTU_DISTRIBUTION="focal"
31+
export UBUNTU_DISTRIBUTION="noble"
3232

3333
#
3434
# We currently support getting the linux kernel from 3 different sources:
@@ -769,6 +769,16 @@ function fetch_repo_from_git() {
769769
logmust git show-ref repo-HEAD
770770
logmust git show-ref upstream-HEAD
771771
else
772+
773+
#
774+
# TODO: Add explanation
775+
#
776+
if [[ "$PACKAGE_GIT_BRANCH" == "os-upgrade" ]]; then
777+
if [[ -n $(git ls-remote --heads origin os-upgrade) ]]; then
778+
PACKAGE_GIT_BRANCH="develop"
779+
fi
780+
fi
781+
772782
logmust git_fetch_helper "$PACKAGE_GIT_URL" --no-tags \
773783
"+$PACKAGE_GIT_BRANCH:repo-HEAD" --depth=1
774784
logmust git show-ref repo-HEAD
@@ -1082,10 +1092,10 @@ function get_kernel_version_for_platform_from_apt() {
10821092
# available, it is not always the case.
10831093
#
10841094

1085-
if [[ "$platform" != generic ]] && [[ "$UBUNTU_DISTRIBUTION" == focal ]]; then
1095+
if [[ "$platform" != generic ]] && [[ "$UBUNTU_DISTRIBUTION" == noble ]]; then
10861096
package="linux-image-${platform}"
10871097
else
1088-
package="linux-image-${platform}-hwe-20.04"
1098+
package="linux-image-${platform}-hwe-24.04"
10891099
fi
10901100

10911101
if [[ "$(apt-cache show --no-all-versions "$package" \

package-lists/build/main.pkgs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,14 @@ delphix-sso-app
1616
drgn
1717
docker-python-image
1818
dwarves
19-
fio
2019
fluentd-gems
21-
gdb-python
2220
grub2
2321
host-jdks
2422
libkdumpfile
2523
make-jpkg
2624
makedumpfile
2725
masking
2826
misc-debs
29-
mold
3027
nfs-utils
3128
performance-diagnostics
3229
ptools

packages/cloud-init/config.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ function build() {
4444
# history, due to how we merge with Ubuntu (i.e. using Ubuntu's
4545
# source package, rather than a git repository).
4646
#
47-
# Thus, without this settinng, the build will fail when it tries
47+
# Thus, without this setting, the build will fail when it tries
4848
# to dynamically set the package version.
4949
#
5050
export TRAVIS_PULL_REQUEST_BRANCH="upstream/"

packages/fio/config.sh

Lines changed: 0 additions & 41 deletions
This file was deleted.

packages/gdb-python/config.sh

Lines changed: 0 additions & 27 deletions
This file was deleted.

packages/mold/config.sh

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)