Skip to content

Commit

Permalink
DLPX-91976 Step 4: linux-pkg: Prepare and update Ubuntu distribution …
Browse files Browse the repository at this point in the history
…pointer to new version (#322)

PR URL: https://www.github.com/delphix/linux-pkg/pull/322
  • Loading branch information
palash-gandhi authored Oct 2, 2024
1 parent b5cb3be commit 812147e
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 13 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 1 addition & 5 deletions default-package-config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -262,11 +262,7 @@ function kernel_update_upstream() {
local tag_prefix_flavour
case "${platform}" in
generic)
if [[ "$UBUNTU_DISTRIBUTION" == focal ]]; then
tag_prefix_flavour="Ubuntu-hwe"
else
tag_prefix_flavour="Ubuntu"
fi
tag_prefix_flavour="Ubuntu"
;;
aws | azure | gcp | oracle)
tag_prefix_flavour="Ubuntu-${platform}"
Expand Down
6 changes: 3 additions & 3 deletions lib/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -1119,10 +1119,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" \
Expand Down
5 changes: 1 addition & 4 deletions packages/misc-debs/config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit 812147e

Please sign in to comment.