This is an automated email from the ASF dual-hosted git repository.
ndimiduk pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.6 by this push:
new c85c9344cb7 HBASE-29163 Fix Github PR builds are broken (addendum for
branch-2s) (#6758)
c85c9344cb7 is described below
commit c85c9344cb70de78f8707960fbea05bee6005e21
Author: Nick Dimiduk <[email protected]>
AuthorDate: Thu Mar 6 11:59:56 2025 +0100
HBASE-29163 Fix Github PR builds are broken (addendum for branch-2s) (#6758)
---
dev-support/Jenkinsfile_GitHub | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/dev-support/Jenkinsfile_GitHub b/dev-support/Jenkinsfile_GitHub
index cd1f7cdcf83..39145beed4b 100644
--- a/dev-support/Jenkinsfile_GitHub
+++ b/dev-support/Jenkinsfile_GitHub
@@ -240,6 +240,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
}
@@ -253,7 +254,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
'''
@@ -377,6 +382,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
}
@@ -390,7 +396,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
'''
