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 2024/06/24 08:01:24 UTC

(hbase) 01/01: HBASE-28678 Make nightly builds for 3.x java 17 only and add java 17 test for 2.x

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

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

commit 856c69806a1d50a48d50962cde8a6ce76f204b3f
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Mon Jun 24 15:15:54 2024 +0800

    HBASE-28678 Make nightly builds for 3.x java 17 only and add java 17 test for 2.x
---
 dev-support/Jenkinsfile | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index 3aadf7316b3..70e35fcb694 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -205,7 +205,7 @@ pipeline {
           environment {
             BASEDIR = "${env.WORKSPACE}/component"
             TESTS = "${env.SHALLOW_CHECKS}"
-            SET_JAVA_HOME = "/usr/lib/jvm/java-11"
+            SET_JAVA_HOME = "${env.BRANCH_NAME ==~ "branch-2*" ? "/usr/lib/jvm/java-11" : "/usr/lib/jvm/java-17"}"
             JAVA8_HOME="/usr/lib/jvm/java-8"
             // Activates hadoop 3.0 profile in maven runs.
             HADOOP_PROFILE = '3.0'
@@ -417,6 +417,9 @@ pipeline {
               label 'hbase'
             }
           }
+          when {
+            branch 'branch-2*'
+          }
           environment {
             BASEDIR = "${env.WORKSPACE}/component"
             TESTS = "${env.DEEP_CHECKS}"
@@ -527,6 +530,9 @@ pipeline {
               label 'hbase'
             }
           }
+          when {
+            branch 'branch-2*'
+          }
           environment {
             BASEDIR = "${env.WORKSPACE}/component"
             TESTS = "${env.DEEP_CHECKS}"
@@ -633,11 +639,6 @@ pipeline {
         }
 
         stage ('yetus jdk17 hadoop3 checks') {
-          when {
-            anyOf {
-              branch 'master';branch 'branch-3'
-            }
-          }
           agent {
             node {
               label 'hbase'
@@ -943,12 +944,14 @@ pipeline {
            unstash 'jdk8-hadoop2-result'
            unstash 'jdk8-hadoop3-result'
            unstash 'jdk11-hadoop3-result'
+           unstash 'jdk17-hadoop3-result'
            unstash 'srctarball-result'
            sh "printenv"
            def results = ["${env.OUTPUT_DIR_RELATIVE_GENERAL}/commentfile",
                           "${env.OUTPUT_DIR_RELATIVE_JDK8_HADOOP2}/commentfile",
                           "${env.OUTPUT_DIR_RELATIVE_JDK8_HADOOP3}/commentfile",
                           "${env.OUTPUT_DIR_RELATIVE_JDK11_HADOOP3}/commentfile",
+                          "${env.OUTPUT_DIR_RELATIVE_JDK17_HADOOP3}/commentfile",
                           'output-srctarball/commentfile',
                           'output-integration/commentfile']
            echo env.BRANCH_NAME