You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mc...@apache.org on 2020/10/20 15:59:03 UTC
[cassandra-builds] branch trunk updated: ASF CI unit tests on JDK11
This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git
The following commit(s) were added to refs/heads/trunk by this push:
new 1b42de8 ASF CI unit tests on JDK11
1b42de8 is described below
commit 1b42de84695589e0e44f891b7ce7453da82dd470
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Tue Oct 20 11:20:06 2020 +0200
ASF CI unit tests on JDK11
patch by Mick Semb Wever; reviewed by Brandon Williams CASSANDRA-15944
---
jenkins-dsl/cassandra_job_dsl_seed.groovy | 38 ++++++++++++++++++-------------
1 file changed, 22 insertions(+), 16 deletions(-)
diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy b/jenkins-dsl/cassandra_job_dsl_seed.groovy
index f779d24..607d612 100644
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -180,12 +180,10 @@ matrixJob('Cassandra-template-artifacts') {
/**
* Ant test template
*/
-job('Cassandra-template-test') {
+matrixJob('Cassandra-template-test') {
disabled(true)
description(jobDescription)
concurrentBuild()
- jdk(jdkLabel)
- label(slaveLabel)
compressBuildLog()
logRotator {
numToKeep(10)
@@ -468,9 +466,17 @@ cassandraBranches.each {
println("Skipping ${targetName} on branch ${branchName}")
} else {
- job("${jobNamePrefix}-${targetName}") {
+ matrixJob("${jobNamePrefix}-${targetName}") {
disabled(false)
using('Cassandra-template-test')
+ axes {
+ if (branchName == 'trunk') {
+ jdk(jdkLabel,'jdk_11_latest')
+ } else {
+ jdk(jdkLabel)
+ }
+ label('label', slaveLabel)
+ }
configure { node ->
node / scm / branches / 'hudson.plugins.git.BranchSpec' / name(branchName)
}
@@ -592,7 +598,7 @@ matrixJob('Cassandra-devbranch-artifacts') {
description(jobDescription)
concurrentBuild()
axes {
- jdk('jdk_1.8_latest','jdk_11_latest')
+ jdk(jdkLabel,'jdk_11_latest')
label('label', slaveLabel)
}
compressBuildLog()
@@ -666,11 +672,13 @@ matrixJob('Cassandra-devbranch-artifacts') {
testTargets.each {
def targetName = it
- job("Cassandra-devbranch-${targetName}") {
+ matrixJob("Cassandra-devbranch-${targetName}") {
description(jobDescription)
concurrentBuild()
- jdk(jdkLabel)
- label(slaveLabel)
+ axes {
+ jdk(jdkLabel,'jdk_11_latest')
+ label('label', slaveLabel)
+ }
compressBuildLog()
logRotator {
numToKeep(10)
@@ -766,12 +774,6 @@ dtestTargets.each {
description(jobDescription)
concurrentBuild()
compressBuildLog()
- jdk(jdkLabel)
- if (targetName == 'dtest-large') {
- label(largeSlaveLabel)
- } else {
- label(slaveLabel)
- }
compressBuildLog()
logRotator {
numToKeep(10)
@@ -799,8 +801,12 @@ dtestTargets.each {
}
(1..splits).each { values << it.toString() }
text('split', values)
- label('label', slaveLabel)
- }
+ if (targetName == 'dtest-large') {
+ label(largeSlaveLabel)
+ } else {
+ label(slaveLabel)
+ }
+ }
properties {
githubProjectUrl(githubRepo)
priorityJobProperty {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org