From 8e387e9dfa4c97b8ae3da1e0d5d1ee7a6cf4fdb3 Mon Sep 17 00:00:00 2001
From: Guanghao Zhang <zghao@apache.org>
Date: Tue, 20 Oct 2020 16:58:43 +0800
Subject: [PATCH] HBASE-25204 Nightly job failed as the name of jdk and maven
 changed (#2567)

Signed-off-by: Duo Zhang <zhangduo@apache.org>
---
 dev-support/Jenkinsfile                             | 4 ++--
 dev-support/adhoc_run_tests/Jenkinsfile             | 4 ++--
 dev-support/flaky-tests/run-flaky-tests.Jenkinsfile | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index 66405d00856..d1240b6183c 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -443,9 +443,9 @@ curl -L  -o personality.sh "${env.PROJECT_PERSONALITY}"
         // See http://hbase.apache.org/book.html#maven.release
         stage ('create source tarball') {
           tools {
-            maven 'Maven (latest)'
+            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.
-            jdk "JDK 1.7 (latest)"
+            jdk "jdk_1.7_latest"
           }
           environment {
             BASEDIR = "${env.WORKSPACE}/component"
diff --git a/dev-support/adhoc_run_tests/Jenkinsfile b/dev-support/adhoc_run_tests/Jenkinsfile
index e06fdba325a..476795d50ca 100644
--- a/dev-support/adhoc_run_tests/Jenkinsfile
+++ b/dev-support/adhoc_run_tests/Jenkinsfile
@@ -51,10 +51,10 @@ pipeline {
   stages {
     stage ('run tests') {
       tools {
-        maven 'Maven (latest)'
+        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.
-        jdk "JDK 1.8 (latest)"
+        jdk "jdk_1.8_latest"
       }
       steps {
         sh """#!/bin/bash -e
diff --git a/dev-support/flaky-tests/run-flaky-tests.Jenkinsfile b/dev-support/flaky-tests/run-flaky-tests.Jenkinsfile
index 6d7d12152fa..c048d83cbd9 100644
--- a/dev-support/flaky-tests/run-flaky-tests.Jenkinsfile
+++ b/dev-support/flaky-tests/run-flaky-tests.Jenkinsfile
@@ -34,8 +34,8 @@ pipeline {
   }
   tools {
     // this should match what the yetus nightly job for the branch will use
-    maven 'Maven (latest)'
-    jdk "JDK 1.8 (latest)"
+    maven 'maven_latest'
+    jdk "jdk_1.8_latest"
   }
   stages {
     stage ('run flaky tests') {