(hbase) branch branch-2.6 updated: HBASE-28693 Addendum add hadoop 3.0 profile for branch-2.x

[zh...@apache.org]

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

zhangduo 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 4066015c9bb HBASE-28693 Addendum add hadoop 3.0 profile for branch-2.x
4066015c9bb is described below

commit 4066015c9bbbd182ccc599c96bf7b57e584a3b71
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Thu Jun 27 17:32:20 2024 +0800

    HBASE-28693 Addendum add hadoop 3.0 profile for branch-2.x
    
    (cherry picked from commit 98572e56ac6c079e6657d699e8185c97011d4951)
---
 dev-support/flaky-tests/run-flaky-tests.Jenkinsfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dev-support/flaky-tests/run-flaky-tests.Jenkinsfile b/dev-support/flaky-tests/run-flaky-tests.Jenkinsfile
index f8b49f9f5c9..ff539954909 100644
--- a/dev-support/flaky-tests/run-flaky-tests.Jenkinsfile
+++ b/dev-support/flaky-tests/run-flaky-tests.Jenkinsfile
@@ -54,6 +54,10 @@ pipeline {
             mvn_args=("${mvn_args[@]}" -X)
             set -x
           fi
+          # need to build against hadoop 3.0 profile for branch-2 when using jdk 11+
+          if [[ "${BRANCH_NAME}" == *"branch-2"* ]]; then
+            mvn_args=("${mvn_args[@]}" -Dhadoop.profile=3.0)
+          fi
           curl "${curl_args[@]}" -o includes.txt "${JENKINS_URL}/job/HBase-Find-Flaky-Tests/job/${BRANCH_NAME}/lastSuccessfulBuild/artifact/output/includes"
           if [ -s includes.txt ]; then
             rm -rf local-repository/org/apache/hbase