Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions BUILDING.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down
18 changes: 9 additions & 9 deletions dev-support/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
'''
}
}
Expand Down Expand Up @@ -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
}

Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions dev-support/bin/create-release
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion dev-support/jenkins.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
7 changes: 4 additions & 3 deletions start-build-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down