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 2022/11/10 05:09:03 UTC
[hbase] 02/02: disable other checks
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch HBASE-27475
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit d6639714f65981f7c6f4ef93917f921de6e7ae8a
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Wed Nov 9 23:22:48 2022 +0800
disable other checks
---
dev-support/Jenkinsfile | 11 ++++++++++-
dev-support/Jenkinsfile_GitHub | 6 ++++++
dev-support/hbase-personality.sh | 6 +++---
dev-support/hbase_nightly_yetus.sh | 2 +-
4 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index 6d4a00d1dd3..050a6353f08 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -304,7 +304,7 @@ pipeline {
}
}
when {
- branch 'branch-2*'
+ branch 'branch-1*'
}
environment {
BASEDIR = "${env.WORKSPACE}/component"
@@ -413,6 +413,9 @@ pipeline {
label 'hbase'
}
}
+ when {
+ branch 'branch-1*'
+ }
environment {
BASEDIR = "${env.WORKSPACE}/component"
TESTS = "${env.DEEP_CHECKS}"
@@ -522,6 +525,9 @@ pipeline {
label 'hbase'
}
}
+ when {
+ branch 'branch-1*'
+ }
environment {
BASEDIR = "${env.WORKSPACE}/component"
TESTS = "${env.DEEP_CHECKS}"
@@ -636,6 +642,9 @@ pipeline {
label 'hbase-large'
}
}
+ when {
+ branch 'branch-1*'
+ }
tools {
maven 'maven_latest'
// this needs to be set to the jdk that ought to be used to build releases on the branch the Jenkinsfile is stored in.
diff --git a/dev-support/Jenkinsfile_GitHub b/dev-support/Jenkinsfile_GitHub
index 753ecaaa5b5..dd63f4e0209 100644
--- a/dev-support/Jenkinsfile_GitHub
+++ b/dev-support/Jenkinsfile_GitHub
@@ -200,6 +200,9 @@ pipeline {
label 'hbase'
}
}
+ when {
+ branch 'branch-1*'
+ }
environment {
// customized per parallel stage
PLUGINS = "${JDK_SPECIFIC_PLUGINS}"
@@ -332,6 +335,9 @@ pipeline {
label 'hbase'
}
}
+ when {
+ branch 'branch-1*'
+ }
environment {
// customized per parallel stage
PLUGINS = "${JDK_SPECIFIC_PLUGINS}"
diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
index 1f8e549201b..05512e966d3 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -178,7 +178,7 @@ function personality_modules
# If we have HADOOP_PROFILE specified and we're on branch-2.x, pass along
# the hadoop.profile system property. Ensures that Hadoop2 and Hadoop3
# logic is not both activated within Maven.
- if [[ -n "${HADOOP_PROFILE}" ]] && [[ "${PATCH_BRANCH}" = branch-2* ]] ; then
+ if [[ -n "${HADOOP_PROFILE}" ]]; then
extra="${extra} -Dhadoop.profile=${HADOOP_PROFILE}"
fi
@@ -490,7 +490,7 @@ function shadedjars_rebuild
# If we have HADOOP_PROFILE specified and we're on branch-2.x, pass along
# the hadoop.profile system property. Ensures that Hadoop2 and Hadoop3
# logic is not both activated within Maven.
- if [[ -n "${HADOOP_PROFILE}" ]] && [[ "${PATCH_BRANCH}" = branch-2* ]] ; then
+ if [[ -n "${HADOOP_PROFILE}" ]]; then
maven_args+=("-Dhadoop.profile=${HADOOP_PROFILE}")
fi
@@ -635,7 +635,7 @@ function hadoopcheck_rebuild
done
hadoop_profile=""
- if [[ "${PATCH_BRANCH}" = branch-2* ]]; then
+ if [[ "${PATCH_BRANCH}" = branch-2* ]] || [[ "${PATCH_BRANCH}" = "HBASE-27475" ]]; then
hadoop_profile="-Dhadoop.profile=3.0"
fi
for hadoopver in ${hbase_hadoop3_versions}; do
diff --git a/dev-support/hbase_nightly_yetus.sh b/dev-support/hbase_nightly_yetus.sh
index d824412835c..44fb76ad4e2 100755
--- a/dev-support/hbase_nightly_yetus.sh
+++ b/dev-support/hbase_nightly_yetus.sh
@@ -78,7 +78,7 @@ fi
if [[ -n "${HADOOP_PROFILE}" ]]; then
# Master has only Hadoop3 support. We don't need to activate any profile.
# The Jenkinsfile should not attempt to run any Hadoop2 tests.
- if [[ "${BRANCH_NAME}" =~ branch-2* ]]; then
+ if [[ "${BRANCH_NAME}" =~ branch-2* ]] || [[ "${BRANCH_NAME}" = "HBASE-27475" ]]; then
YETUS_ARGS=("--hadoop-profile=${HADOOP_PROFILE}" "${YETUS_ARGS[@]}")
fi
fi