[hbase] branch HBASE-24198 updated (2a3d157 -> d2a4192)

[zh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a change to branch HBASE-24198
in repository https://gitbox.apache.org/repos/asf/hbase.git.


    omit 2a3d157  HBASE-24198 Make nightly job run hadoop3 check on JDK8
     new d2a4192  HBASE-24198 Skip hadoop2 check for master branch

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (2a3d157)
            \
             N -- N -- N   refs/heads/HBASE-24198 (d2a4192)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 dev-support/Jenkinsfile | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

[hbase] 01/01: HBASE-24198 Skip hadoop2 check for master branch

[zh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a commit to branch HBASE-24198
in repository https://gitbox.apache.org/repos/asf/hbase.git

commit d2a41925f9043f85fbd7d1f7f382ccc4197b115d
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Fri Apr 17 14:35:47 2020 +0800

    HBASE-24198 Skip hadoop2 check for master branch
---
 dev-support/Jenkinsfile            | 3 +++
 dev-support/hbase_nightly_yetus.sh | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index 5994bbb..8a8b358 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -341,6 +341,9 @@ pipeline {
               label 'Hadoop'
             }
           }
+          when {
+            anyOf { branch 'branch-1*'; branch 'branch-2*' }
+          }
           environment {
             BASEDIR = "${env.WORKSPACE}/component"
             TESTS = "${env.DEEP_CHECKS}"
diff --git a/dev-support/hbase_nightly_yetus.sh b/dev-support/hbase_nightly_yetus.sh
index ef91f20..9fa7b55 100755
--- a/dev-support/hbase_nightly_yetus.sh
+++ b/dev-support/hbase_nightly_yetus.sh
@@ -76,7 +76,7 @@ fi
 
 # For testing with specific hadoop version. Activates corresponding profile in maven runs.
 if [[ -n "${HADOOP_PROFILE}" ]]; then
-  YETUS_ARGS=("--hadoop-profile=${HADOOP_PROFILE}" "${YETUS_ARGS[@]}")
+  YETUS_ARGS=("-Phadoop-${HADOOP_PROFILE}" "${YETUS_ARGS[@]}")
 fi
 
 if [[ -n "${SKIP_ERROR_PRONE}" ]]; then