This is an automated email from the ASF dual-hosted git repository.
aajisaka pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new f79bca8369d HADOOP-19774. Bump default OS version to Ubuntu 24.04
(#8219)
f79bca8369d is described below
commit f79bca8369de55c57c672b833709a3e15fafdd40
Author: Akira Ajisaka <[email protected]>
AuthorDate: Sun Feb 1 19:33:59 2026 +0900
HADOOP-19774. Bump default OS version to Ubuntu 24.04 (#8219)
Signed-off-by: Chris Nauroth <[email protected]>
Signed-off-by: Ayush Saxena <[email protected]>
---
BUILDING.txt | 6 +++---
dev-support/Jenkinsfile | 18 +++++++++---------
dev-support/bin/create-release | 4 ++--
.../docker/{Dockerfile => Dockerfile_ubuntu_20} | 0
...Dockerfile_aarch64 => Dockerfile_ubuntu_20_aarch64} | 0
dev-support/jenkins.sh | 2 +-
start-build-env.sh | 7 ++++---
7 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/BUILDING.txt b/BUILDING.txt
index ab93e27f5fd..19edd1b0ce3 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -32,8 +32,8 @@ On Linux / Mac:
$ ./start-build-env.sh [OS platform]
- [OS Platform] One of [rockylinux_8, debian_11, debian_12, debian_13,
ubuntu_20, ubuntu_24, windows_10].
- Default is 'ubuntu_20'.
- Note: Currently only default ('ubuntu_20') is supported on arm machine
+ Default is 'ubuntu_24'.
+ Note: Currently only ubuntu is supported on arm machine
The prompt which is then presented is located at a mounted version of the
source tree
and all required tools for testing and building have been installed and
configured.
@@ -57,7 +57,7 @@ Known issues:
----------------------------------------------------------------------------------
Installing required packages for clean install of Ubuntu 18.04 LTS Desktop.
(For Ubuntu 20.04, gcc/g++ and cmake bundled with Ubuntu can be used.
-Refer to dev-support/docker/Dockerfile):
+Refer to dev-support/docker/Dockerfile_ubuntu_20):
* Open JDK 17
$ sudo apt-get update
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index 8cc03dff69d..fe44bc435e9 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -98,10 +98,10 @@ pipeline {
'''
}
- dir("${WORKSPACE}/ubuntu-focal") {
+ dir("${WORKSPACE}/ubuntu-noble") {
sh '''#!/usr/bin/env bash
- cp -Rp ${WORKSPACE}/src ${WORKSPACE}/ubuntu-focal
+ cp -Rp ${WORKSPACE}/src ${WORKSPACE}/ubuntu-noble
'''
}
}
@@ -199,13 +199,13 @@ pipeline {
}
}
- // We want to use Ubuntu Focal as our main CI and thus, this stage
+ // We want to use Ubuntu Noble as our main CI and thus, this stage
// isn't optional (runs for all the PRs).
- stage ('precommit-run Ubuntu focal') {
+ stage ('precommit-run Ubuntu Noble') {
environment {
- SOURCEDIR = "${WORKSPACE}/ubuntu-focal/src"
- PATCHDIR = "${WORKSPACE}/ubuntu-focal/out"
- DOCKERFILE = "${SOURCEDIR}/dev-support/docker/Dockerfile"
+ SOURCEDIR = "${WORKSPACE}/ubuntu-noble/src"
+ PATCHDIR = "${WORKSPACE}/ubuntu-noble/out"
+ DOCKERFILE =
"${SOURCEDIR}/dev-support/docker/Dockerfile_ubuntu_24"
IS_OPTIONAL = 0
}
@@ -229,8 +229,8 @@ pipeline {
usernameVariable:
'GITHUB_USER')]) {
sh '''#!/usr/bin/env bash
- # Copy the artifacts of Ubuntu focal build to
workspace
- cp -Rp "${WORKSPACE}/ubuntu-focal/out"
"${WORKSPACE}"
+ # Copy the artifacts of Ubuntu Noble build to
workspace
+ cp -Rp "${WORKSPACE}/ubuntu-noble/out"
"${WORKSPACE}"
# Send Github status
chmod u+x "${SOURCEDIR}/dev-support/jenkins.sh"
diff --git a/dev-support/bin/create-release b/dev-support/bin/create-release
index b659422a7c1..54ebc5f1cdc 100755
--- a/dev-support/bin/create-release
+++ b/dev-support/bin/create-release
@@ -201,12 +201,12 @@ function set_defaults
DOCKER=false
DOCKERCACHE=false
- DOCKERFILE="${BASEDIR}/dev-support/docker/Dockerfile"
+ DOCKERFILE="${BASEDIR}/dev-support/docker/Dockerfile_ubuntu_24"
DOCKERRAN=false
CPU_ARCH=$(echo "$MACHTYPE" | cut -d- -f1)
if [[ "$CPU_ARCH" = "aarch64" || "$CPU_ARCH" = "arm64" ]]; then
- DOCKERFILE="${BASEDIR}/dev-support/docker/Dockerfile_aarch64"
+ DOCKERFILE="${BASEDIR}/dev-support/docker/Dockerfile_ubuntu_24_aarch64"
fi
# Extract Java version from ${BASEDIR}/pom.xml
diff --git a/dev-support/docker/Dockerfile
b/dev-support/docker/Dockerfile_ubuntu_20
similarity index 100%
rename from dev-support/docker/Dockerfile
rename to dev-support/docker/Dockerfile_ubuntu_20
diff --git a/dev-support/docker/Dockerfile_aarch64
b/dev-support/docker/Dockerfile_ubuntu_20_aarch64
similarity index 100%
rename from dev-support/docker/Dockerfile_aarch64
rename to dev-support/docker/Dockerfile_ubuntu_20_aarch64
diff --git a/dev-support/jenkins.sh b/dev-support/jenkins.sh
index fd6ab2340bf..b343df74001 100644
--- a/dev-support/jenkins.sh
+++ b/dev-support/jenkins.sh
@@ -18,7 +18,7 @@
# This script is called from the Jenkinsfile, which ultimately runs
# the CI through Yetus.
-# We use Ubuntu Focal as the main platform for building Hadoop, thus
+# We use Ubuntu Noble as the main platform for building Hadoop, thus
# it runs for all the PRs. Additionally, we also ensure that
# Hadoop builds across the supported platforms whenever there's a change
# in any of the C/C++ files, C/C++ build files or platform changes.
diff --git a/start-build-env.sh b/start-build-env.sh
index 4f5f85947e3..abc28035f8d 100755
--- a/start-build-env.sh
+++ b/start-build-env.sh
@@ -22,13 +22,14 @@ cd "$(dirname "$0")" # connect to root
OS_PLATFORM="${1:-}"
[ "$#" -gt 0 ] && shift
-DEFAULT_OS_PLATFORM="ubuntu_20"
+DEFAULT_OS_PLATFORM="ubuntu_24"
OS_PLATFORM_SUFFIX=""
-if [[ -n ${OS_PLATFORM} ]] && [[ "${OS_PLATFORM}" != "${DEFAULT_OS_PLATFORM}"
]]; then
- # ubuntu_20 (default) platform does not have suffix in Dockerfile.
+if [[ -n ${OS_PLATFORM} ]]; then
OS_PLATFORM_SUFFIX="_${OS_PLATFORM}"
+else
+ OS_PLATFORM_SUFFIX="_${DEFAULT_OS_PLATFORM}"
fi
DOCKER_DIR=dev-support/docker
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
