In Jenkins use the new JDK labels (INFRA-20858,CASSANDRA-15943)
ref: https://lists.apache.org/thread.html/rb4c2834b9874b9f4a74c528de9055958483d2bc6e62c3464bc5c053f%40%3Cbuilds.apache.org%3E
diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy b/jenkins-dsl/cassandra_job_dsl_seed.groovy
index 73129cc..b706ff8 100644
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -10,7 +10,7 @@
////////////////////////////////////////////////////////////
def jobDescription = '<img src="http://cassandra.apache.org/img/cassandra_logo.png" /><br/>Apache Cassandra DSL-generated job - DSL git repo: <a href="https://gitbox.apache.org/repos/asf?p=cassandra-builds.git">cassandra-builds</a>'
-def jdkLabel = 'JDK 1.8 (latest)'
+def jdkLabel = 'jdk_1.8_latest'
if(binding.hasVariable("CASSANDRA_JDK_LABEL")) {
jdkLabel = "${CASSANDRA_JDK_LABEL}"
}
@@ -439,9 +439,9 @@
using('Cassandra-template-artifacts')
axes {
if (branchName == 'trunk') {
- jdk('JDK 1.8 (latest)','JDK 11 (latest)')
+ jdk('jdk_1.8_latest','jdk_11_latest')
} else {
- jdk('JDK 1.8 (latest)')
+ jdk('jdk_1.8_latest')
}
label('label', slaveLabel)
}
@@ -592,7 +592,7 @@
description(jobDescription)
concurrentBuild()
axes {
- jdk('JDK 1.8 (latest)','JDK 11 (latest)')
+ jdk('jdk_1.8_latest','jdk_11_latest')
label('label', slaveLabel)
}
compressBuildLog()
