You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2021/10/20 16:03:19 UTC
[hbase] branch HBASE-26318 updated: fix base path
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch HBASE-26318
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/HBASE-26318 by this push:
new 11c16f8 fix base path
11c16f8 is described below
commit 11c16f87dd9f94783c845b04db94f3d37c214ed0
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Thu Oct 21 00:02:42 2021 +0800
fix base path
---
dev-support/Jenkinsfile_GitHub | 5 +++--
dev-support/hbase-personality.sh | 8 ++++----
dev-support/jenkins_precommit_github_yetus.sh | 4 ++--
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/dev-support/Jenkinsfile_GitHub b/dev-support/Jenkinsfile_GitHub
index c0b8fb2..b72d8a5 100644
--- a/dev-support/Jenkinsfile_GitHub
+++ b/dev-support/Jenkinsfile_GitHub
@@ -85,6 +85,7 @@ pipeline {
BUILD_URL_ARTIFACTS = "artifact/${WORKDIR_REL}/${PATCH_REL}"
DOCKERFILE = "${WORKDIR}/${DOCKERFILE_REL}"
YETUS_DRIVER = "${WORKDIR}/${YETUS_DRIVER_REL}"
+ ASF_NIGHTLIES_GENERAL_CHECK_BASE="${ASF_NIGHTLIES_BASE}/${WORKDIR_REL}/${PATCH_REL}"
}
steps {
dir("${SOURCEDIR}") {
@@ -139,14 +140,14 @@ pipeline {
if [ -d "${WORKDIR_REL}/${PATCH_REL}/branch-site" ]; then
echo "Remove ${WORKDIR_REL}/${PATCH_REL}/branch-site for saving space"
rm -rf "${WORKDIR_REL}/${PATCH_REL}/branch-site"
- python ${SOURCEDIR}/dev-support/gen_redirect_html.py "${ASF_NIGHTLIES_BASE}/${WORKDIR_REL}/${PATCH_REL}/branch-site" > "${PATCHDIR}/branch-site.html"
+ python ${SOURCEDIR}/dev-support/gen_redirect_html.py "${ASF_NIGHTLIES_GENERAL_CHECK_BASE}/branch-site" > "${PATCHDIR}/branch-site.html"
else
echo "No branch-site, skipping"
fi
if [ -d "${WORKDIR_REL}/${PATCH_REL}/patch-site" ]; then
echo "Remove ${WORKDIR_REL}/${PATCH_REL}/patch-site for saving space"
rm -rf "${WORKDIR_REL}/${PATCH_REL}/patch-site"
- python ${SOURCEDIR}/dev-support/gen_redirect_html.py "${ASF_NIGHTLIES_BASE}/${WORKDIR_REL}/${PATCH_REL}/patch-site" > "${PATCHDIR}/patch-site.html"
+ python ${SOURCEDIR}/dev-support/gen_redirect_html.py "${ASF_NIGHTLIES_GENERAL_CHECK_BASE}/${PATCH_REL}/patch-site" > "${PATCHDIR}/patch-site.html"
else
echo "No patch-site, skipping"
fi
diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
index 091c2b6..6de1e06 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -115,9 +115,9 @@ function personality_parse_args
delete_parameter "${i}"
SKIP_ERRORPRONE=true
;;
- --asf-nightlies-base=*)
+ --asf-nightlies-general-check-base=*)
delete_parameter "${i}"
- ASF_NIGHTLIES_BASE=${i#*=}
+ ASF_NIGHTLIES_GENERAL_CHECK_BASE=${i#*=}
;;
esac
done
@@ -418,8 +418,8 @@ function refguide_rebuild
fi
add_vote_table 0 refguide "${repostatus} has no errors when building the reference guide. See footer for rendered docs, which you should manually inspect."
- if [[ -n "${ASF_NIGHTLIES_BASE}" ]]; then
- add_footer_table refguide "${ASF_NIGHTLIES_BASE}/${repostatus}-site/book.html"
+ if [[ -n "${ASF_NIGHTLIES_GENERAL_CHECK_BASE}" ]]; then
+ add_footer_table refguide "${ASF_NIGHTLIES_GENERAL_CHECK_BASE}/${repostatus}-site/book.html"
else
add_footer_table refguide "@@BASE@@/${repostatus}-site/book.html"
fi
diff --git a/dev-support/jenkins_precommit_github_yetus.sh b/dev-support/jenkins_precommit_github_yetus.sh
index d77f831..9652d1e 100755
--- a/dev-support/jenkins_precommit_github_yetus.sh
+++ b/dev-support/jenkins_precommit_github_yetus.sh
@@ -144,8 +144,8 @@ YETUS_ARGS+=("--sentinel")
# use emoji vote so it is easier to find the broken line
YETUS_ARGS+=("--github-use-emoji-vote")
# pass asf nightlies url in
-if [[ -n "${ASF_NIGHTLIES_BASE}" ]]; then
- YETUS_ARGS+=("--asf-nightlies-base=${ASF_NIGHTLIES_BASE}")
+if [[ -n "${ASF_NIGHTLIES_GENERAL_CHECK_BASE}" ]]; then
+ YETUS_ARGS+=("--asf-nightlies-general-check-base=${ASF_NIGHTLIES_GENERAL_CHECK_BASE}")
fi
echo "Launching yetus with command line:"