This is an automated email from the ASF dual-hosted git repository.
ndimiduk pushed a commit to branch branch-2.5
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.5 by this push:
new 7e365e0509c HBASE-29163 Fix Github PR builds are broken (#6751)
7e365e0509c is described below
commit 7e365e0509cd9a2207a047a857b4b2adfeaa3d46
Author: Nick Dimiduk <[email protected]>
AuthorDate: Wed Mar 5 13:28:49 2025 +0100
HBASE-29163 Fix Github PR builds are broken (#6751)
Signed-off-by: Ray Mattingly <[email protected]>
---
dev-support/Jenkinsfile_GitHub | 15 +++++++++++++--
.../jenkins-scripts/cache-apache-project-artifact.sh | 2 +-
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/dev-support/Jenkinsfile_GitHub b/dev-support/Jenkinsfile_GitHub
index 74c165d3ddc..cd1f7cdcf83 100644
--- a/dev-support/Jenkinsfile_GitHub
+++ b/dev-support/Jenkinsfile_GitHub
@@ -35,6 +35,7 @@ pipeline {
PATCH_REL = 'output'
YETUS_REL = 'yetus'
DOCKERFILE_REL = "${SRC_REL}/dev-support/docker/Dockerfile"
+ CACHE_APACHE_ARTIFACT_REL =
"${SRC_REL}/dev-support/jenkins-scripts/cache-apache-project-artifact.sh"
YETUS_DRIVER_REL =
"${SRC_REL}/dev-support/jenkins_precommit_github_yetus.sh"
YETUS_VERSION = '0.15.0'
GENERAL_CHECK_PLUGINS = 'all,-javadoc,-jira,-shadedjars,-unit'
@@ -93,6 +94,7 @@ pipeline {
PATCHDIR = "${WORKDIR}/${PATCH_REL}"
BUILD_URL_ARTIFACTS =
"artifact/${WORKDIR_REL}/${PATCH_REL}"
DOCKERFILE = "${WORKDIR}/${DOCKERFILE_REL}"
+ CACHE_APACHE_ARTIFACT =
"${WORKDIR}/${CACHE_APACHE_ARTIFACT_REL}"
YETUS_DRIVER = "${WORKDIR}/${YETUS_DRIVER_REL}"
ASF_NIGHTLIES_GENERAL_CHECK_BASE="${ASF_NIGHTLIES_BASE}/${WORKDIR_REL}/${PATCH_REL}"
HIDE_OLD_COMMENTS =
"${SOURCEDIR}/dev-support/gh_hide_old_comments.sh"
@@ -107,7 +109,11 @@ pipeline {
}
dir("${YETUSDIR}") {
sh'''#!/usr/bin/env bash
- wget
https://dlcdn.apache.org/yetus/${YETUS_VERSION}/apache-yetus-${YETUS_VERSION}-bin.tar.gz
&& \
+ "${CACHE_APACHE_ARTIFACT}" \
+ --keys
'https://downloads.apache.org/yetus/KEYS' \
+ --verify-tar-gz \
+ ./apache-yetus-${YETUS_VERSION}-bin.tar.gz \
+
yetus/${YETUS_VERSION}/apache-yetus-${YETUS_VERSION}-bin.tar.gz && \
tar --strip-components=1 -xzf
apache-yetus-${YETUS_VERSION}-bin.tar.gz && \
rm apache-yetus-${YETUS_VERSION}-bin.tar.gz
'''
@@ -508,6 +514,7 @@ pipeline {
PATCHDIR = "${WORKDIR}/${PATCH_REL}"
BUILD_URL_ARTIFACTS =
"artifact/${WORKDIR_REL}/${PATCH_REL}"
DOCKERFILE = "${WORKDIR}/${DOCKERFILE_REL}"
+ CACHE_APACHE_ARTIFACT =
"${WORKDIR}/${CACHE_APACHE_ARTIFACT_REL}"
YETUS_DRIVER = "${WORKDIR}/${YETUS_DRIVER_REL}"
SKIP_ERRORPRONE = true
}
@@ -521,7 +528,11 @@ pipeline {
}
dir("${YETUSDIR}") {
sh'''#!/usr/bin/env bash
- wget
https://dlcdn.apache.org/yetus/${YETUS_VERSION}/apache-yetus-${YETUS_VERSION}-bin.tar.gz
&& \
+ "${CACHE_APACHE_ARTIFACT}" \
+ --keys
'https://downloads.apache.org/yetus/KEYS' \
+ --verify-tar-gz \
+ ./apache-yetus-${YETUS_VERSION}-bin.tar.gz \
+
yetus/${YETUS_VERSION}/apache-yetus-${YETUS_VERSION}-bin.tar.gz && \
tar --strip-components=1 -xzf
apache-yetus-${YETUS_VERSION}-bin.tar.gz && \
rm apache-yetus-${YETUS_VERSION}-bin.tar.gz
'''
diff --git a/dev-support/jenkins-scripts/cache-apache-project-artifact.sh
b/dev-support/jenkins-scripts/cache-apache-project-artifact.sh
index ddd65b69a0f..e909ca9448d 100755
--- a/dev-support/jenkins-scripts/cache-apache-project-artifact.sh
+++ b/dev-support/jenkins-scripts/cache-apache-project-artifact.sh
@@ -76,7 +76,7 @@ if [ -f "${target}" ] && [ -s "${target}" ] && [ -r
"${target}" ] && [ "true" =
fi
if [ -z "${working_dir}" ]; then
- if ! working_dir="$(mktemp -d -t hbase-download-apache-artifact)" ; then
+ if ! working_dir="$(mktemp -d -t hbase-download-apache-artifact-XXXXXX)" ;
then
echo "Failed to create temporary working directory. Please specify via
--working-dir" >&2
exit 1
fi
