This is an automated email from the ASF dual-hosted git repository.
brandonwilliams 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 be0e963 more 4.0.0 additions for jdk version/dtest upgrades
be0e963 is described below
commit be0e96356b095165049183048a0d9e67b1dfae7f
Author: Brandon Williams <[email protected]>
AuthorDate: Thu Jun 3 12:12:54 2021 -0500
more 4.0.0 additions for jdk version/dtest upgrades
---
jenkins-dsl/cassandra_job_dsl_seed.groovy | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy
b/jenkins-dsl/cassandra_job_dsl_seed.groovy
index 2b249c2..f1dde4d 100644
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -380,7 +380,7 @@ cassandraBranches.each {
disabled(false)
using('Cassandra-template-artifacts')
axes {
- if (branchName == 'trunk' || branchName == 'cassandra-4.0') {
+ if (branchName == 'trunk' || branchName == 'cassandra-4.0.0' ||
branchName == 'cassandra-4.0') {
jdk('jdk_1.8_latest','jdk_11_latest')
} else {
jdk('jdk_1.8_latest')
@@ -454,7 +454,7 @@ cassandraBranches.each {
_testSplits = "/${testSplits}"
}
// jvm-dtest-upgrade would require mixed JDK compilations
to support JDK11+
- if ((branchName == 'trunk' || branchName ==
'cassandra-4.0') && targetName != 'jvm-dtest-upgrade') {
+ if ((branchName == 'trunk' || branchName ==
'cassandra-4.0.0' || branchName == 'cassandra-4.0') && targetName !=
'jvm-dtest-upgrade') {
jdk(jdkLabel,'jdk_11_latest')
} else {
jdk(jdkLabel)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]