This is an automated email from the ASF dual-hosted git repository.
zghao pushed a commit to branch branch-1.4
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-1.4 by this push:
new cb5c88c HBASE-25204 Nightly job failed as the name of jdk and maven
changed (#2567)
cb5c88c is described below
commit cb5c88c779df796ad894f31b3d26d4fbdde27a77
Author: Guanghao Zhang <[email protected]>
AuthorDate: Tue Oct 20 16:58:43 2020 +0800
HBASE-25204 Nightly job failed as the name of jdk and maven changed (#2567)
Signed-off-by: Duo Zhang <[email protected]>
---
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 66405d0..d1240b6 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 e06fdba..476795d 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 c84a3ac..a2fb06a 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') {