File tree Expand file tree Collapse file tree 4 files changed +6
-13
lines changed Expand file tree Collapse file tree 4 files changed +6
-13
lines changed Original file line number Diff line number Diff 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
3333developer packages installed, such as git, and passwordless sudo enabled. Note
3434that it will automatically install various build-dependencies on the system, so
3535as a safety precaution it is currently restricted to only run on an AWS instance
Original file line number Diff line number Diff line change @@ -262,11 +262,7 @@ function kernel_update_upstream() {
262262 local tag_prefix_flavour
263263 case " ${platform} " in
264264 generic)
265- if [[ " $UBUNTU_DISTRIBUTION " == focal ]]; then
266- tag_prefix_flavour=" Ubuntu-hwe"
267- else
268- tag_prefix_flavour=" Ubuntu"
269- fi
265+ tag_prefix_flavour=" Ubuntu"
270266 ;;
271267 aws | azure | gcp | oracle)
272268 tag_prefix_flavour=" Ubuntu-${platform} "
Original file line number Diff line number Diff line change @@ -28,7 +28,7 @@ export SUPPORTED_KERNEL_FLAVORS="generic aws gcp azure oracle"
2828#
2929export 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:
@@ -1119,10 +1119,10 @@ function get_kernel_version_for_platform_from_apt() {
11191119 # available, it is not always the case.
11201120 #
11211121
1122- if [[ " $platform " != generic ]] && [[ " $UBUNTU_DISTRIBUTION " == focal ]]; then
1122+ if [[ " $platform " != generic ]] && [[ " $UBUNTU_DISTRIBUTION " == noble ]]; then
11231123 package=" linux-image-${platform} "
11241124 else
1125- package=" linux-image-${platform} -hwe-20 .04"
1125+ package=" linux-image-${platform} -hwe-24 .04"
11261126 fi
11271127
11281128 if [[ " $( apt-cache show --no-all-versions " $package " \
Original file line number Diff line number Diff line change @@ -47,10 +47,7 @@ SKIP_COPYRIGHTS_CHECK=true
4747function fetch() {
4848 logmust cd " $WORKDIR /artifacts"
4949
50- local debs=(
51- # Copied from https://s3.amazonaws.com/packages.treasuredata.com/4/ubuntu/focal/pool/contrib/t/td-agent/td-agent_4.4.2-1_arm64.deb
52- " td-agent_4.4.2-1_amd64.deb b40c1883c3849e9a7bf67762c9f9a87a6119ad98f1fae64a83d754e1275a379a"
53- )
50+ local debs=()
5451
5552 local url=" http://artifactory.delphix.com/artifactory/linux-pkg/misc-debs"
5653
You can’t perform that action at this time.
0 commit comments