From 562d2897b3005990483ed4e4178335277e90e3fb Mon Sep 17 00:00:00 2001
From: Palash Gandhi <palash.gandhi@delphix.com>
Date: Tue, 27 Aug 2024 11:12:23 -0700
Subject: [PATCH] DLPX-91976 linux-pkg: Prepare and update Ubuntu distribution
 pointer to new version

PR URL: https://www.github.com/delphix/linux-pkg/pull/321
---
 README.md                    | 2 +-
 default-package-config.sh    | 2 +-
 lib/common.sh                | 6 +++---
 packages/misc-debs/config.sh | 5 +----
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 4efa6b0..ae292b4 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ projects.
 
 ## System Requirements
 
-This framework is intended to be run on an Ubuntu 20.04 system with some basic
+This framework is intended to be run on an Ubuntu 24.04 system with some basic
 developer packages installed, such as git, and passwordless sudo enabled. Note
 that it will automatically install various build-dependencies on the system, so
 as a safety precaution it is currently restricted to only run on an AWS instance
diff --git a/default-package-config.sh b/default-package-config.sh
index 93f962c..1f5497c 100644
--- a/default-package-config.sh
+++ b/default-package-config.sh
@@ -262,7 +262,7 @@ function kernel_update_upstream() {
 	local tag_prefix_flavour
 	case "${platform}" in
 	generic)
-		if [[ "$UBUNTU_DISTRIBUTION" == focal ]]; then
+		if [[ "$UBUNTU_DISTRIBUTION" == noble ]]; then
 			tag_prefix_flavour="Ubuntu-hwe"
 		else
 			tag_prefix_flavour="Ubuntu"
diff --git a/lib/common.sh b/lib/common.sh
index 20bc7df..a5c57f6 100644
--- a/lib/common.sh
+++ b/lib/common.sh
@@ -28,7 +28,7 @@ export SUPPORTED_KERNEL_FLAVORS="generic aws gcp azure oracle"
 #
 export JENKINS_OPS_DIR="${JENKINS_OPS_DIR:-jenkins-ops}"
 
-export UBUNTU_DISTRIBUTION="focal"
+export UBUNTU_DISTRIBUTION="noble"
 
 #
 # We currently support getting the linux kernel from 3 different sources:
@@ -1100,10 +1100,10 @@ function get_kernel_version_for_platform_from_apt() {
 	# available, it is not always the case.
 	#
 
-	if [[ "$platform" != generic ]] && [[ "$UBUNTU_DISTRIBUTION" == focal ]]; then
+	if [[ "$platform" != generic ]] && [[ "$UBUNTU_DISTRIBUTION" == noble ]]; then
 		package="linux-image-${platform}"
 	else
-		package="linux-image-${platform}-hwe-20.04"
+		package="linux-image-${platform}-hwe-24.04"
 	fi
 
 	if [[ "$(apt-cache show --no-all-versions "$package" \
diff --git a/packages/misc-debs/config.sh b/packages/misc-debs/config.sh
index 3fc41b3..3622531 100644
--- a/packages/misc-debs/config.sh
+++ b/packages/misc-debs/config.sh
@@ -47,10 +47,7 @@ SKIP_COPYRIGHTS_CHECK=true
 function fetch() {
 	logmust cd "$WORKDIR/artifacts"
 
-	local debs=(
-		# 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
-		"td-agent_4.4.2-1_amd64.deb b40c1883c3849e9a7bf67762c9f9a87a6119ad98f1fae64a83d754e1275a379a"
-	)
+	local debs=()
 
 	local url="http://artifactory.delphix.com/artifactory/linux-pkg/misc-debs"