(hbase) 01/01: HBASE-28693 Change flaky tests to run with jdk17

[zh...@apache.org]

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

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

commit 1992a3bc5c20cec86b4ff75b84035737cd1fb703
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Thu Jun 27 12:09:42 2024 +0800

    HBASE-28693 Change flaky tests to run with jdk17
---
 dev-support/flaky-tests/run-flaky-tests.Jenkinsfile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/dev-support/flaky-tests/run-flaky-tests.Jenkinsfile b/dev-support/flaky-tests/run-flaky-tests.Jenkinsfile
index bea139c548a..dbd79c26f2b 100644
--- a/dev-support/flaky-tests/run-flaky-tests.Jenkinsfile
+++ b/dev-support/flaky-tests/run-flaky-tests.Jenkinsfile
@@ -19,6 +19,9 @@ pipeline {
     node {
       label 'hbase'
     }
+    dockerfile {
+      dir 'dev-support/docker'
+    }
   }
   triggers {
     cron('@hourly') // See https://jenkins.io/doc/book/pipeline/syntax/#cron-syntax
@@ -31,20 +34,17 @@ pipeline {
   }
   environment {
     ASF_NIGHTLIES = 'https://nightlies.apache.org'
+    JAVA_HOME = '/usr/lib/jvm/java-17'
   }
   parameters {
     booleanParam(name: 'DEBUG', defaultValue: false, description: 'Produce a lot more meta-information.')
   }
-  tools {
-    // this should match what the yetus nightly job for the branch will use
-    maven 'maven_latest'
-    jdk "jdk_1.8_latest"
-  }
   stages {
     stage ('run flaky tests') {
       steps {
         sh '''#!/usr/bin/env bash
           set -e
+          MVN="${MAVEN_HOME}/bin/mvn"
           declare -a curl_args=(--fail)
           tmpdir=$(realpath target)
           declare -a mvn_args=(--batch-mode -fn -Dbuild.id="${BUILD_ID}" -Dmaven.repo.local="${WORKSPACE}/local-repository" -Djava.io.tmpdir=${tmpdir})
@@ -53,7 +53,7 @@ pipeline {
             mvn_args=("${mvn_args[@]}" -X)
             set -x
           fi
-          curl "${curl_args[@]}" -o includes.txt "${JENKINS_URL}/job/HBase-Find-Flaky-Tests/job/${BRANCH_NAME}/lastSuccessfulBuild/artifact/output/includes"
+          curl "${curl_args[@]}" -o includes.txt "${JENKINS_URL}/job/HBase-Find-Flaky-Tests/job/master/lastSuccessfulBuild/artifact/output/includes"
           if [ -s includes.txt ]; then
             rm -rf local-repository/org/apache/hbase
             mvn clean "${mvn_args[@]}"
@@ -65,11 +65,11 @@ pipeline {
             else
               echo "Skipped gathering machine environment because we couldn't read the script to do so."
             fi
-            mvn -T0.25C package "${mvn_args[@]}" -Dtest="$(cat includes.txt)" -Dmaven.test.redirectTestOutputToFile=true -Dsurefire.firstPartForkCount=0.25C -Dsurefire.secondPartForkCount=0.25C
+            ${MVN} -T0.25C package "${mvn_args[@]}" -Dtest="$(cat includes.txt)" -Dmaven.test.redirectTestOutputToFile=true -Dsurefire.firstPartForkCount=0.25C -Dsurefire.secondPartForkCount=0.25C
           else
             echo "set of flaky tests is currently empty."
           fi
-'''
+        '''
       }
     }
   }