From c53f5a2da5b5f8f314dd08018becf98f65935c32 Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Wed, 6 Nov 2024 17:47:30 -0600 Subject: [PATCH] Switch to C* 5.0 + other version fixes --- Jenkinsfile-datastax | 66 ++++---------------------------------------- 1 file changed, 6 insertions(+), 60 deletions(-) diff --git a/Jenkinsfile-datastax b/Jenkinsfile-datastax index af3faafee2..00aeaad343 100644 --- a/Jenkinsfile-datastax +++ b/Jenkinsfile-datastax @@ -274,12 +274,8 @@ pipeline { '3.11', // Previous Apache CassandraⓇ '4.0', // Previous Apache CassandraⓇ '4.1', // Current Apache CassandraⓇ - '5.0-beta1', // Development Apache CassandraⓇ - 'dse-4.8.16', // Previous EOSL DataStax Enterprise - 'dse-5.0.15', // Long Term Support DataStax Enterprise + '5.0', // Development Apache CassandraⓇ 'dse-5.1.35', // Legacy DataStax Enterprise - 'dse-6.0.18', // Previous DataStax Enterprise - 'dse-6.7.17', // Previous DataStax Enterprise 'dse-6.8.30', // Current DataStax Enterprise 'dse-6.9.0', // Current DataStax Enterprise 'hcd-1.0.0', // Current DataStax HCD @@ -292,14 +288,6 @@ pipeline { Choice Description - - 2.1 - Apache Cassandra® v2.1.x - - - 2.2 - Apache Cassandra® v2.2.x - 3.0 Apache Cassandra® v3.0.x @@ -316,26 +304,10 @@ pipeline { 4.1 Apache Cassandra® v4.1.x - - dse-4.8.16 - DataStax Enterprise v4.8.x (END OF SERVICE LIFE) - - - dse-5.0.15 - DataStax Enterprise v5.0.x (Long Term Support) - dse-5.1.35 DataStax Enterprise v5.1.x - - dse-6.0.18 - DataStax Enterprise v6.0.x - - - dse-6.7.17 - DataStax Enterprise v6.7.x - dse-6.8.30 DataStax Enterprise v6.8.x @@ -371,30 +343,10 @@ pipeline { 1.8 Oracle JDK version 1.8 (Used for compiling regardless of choice) - - openjdk@1.9 - OpenJDK version 9 - - - openjdk@1.10 - OpenJDK version 10 - openjdk@1.11 OpenJDK version 11 - - openjdk@1.12 - OpenJDK version 12 - - - openjdk@1.13 - OpenJDK version 13 - - - openjdk@1.14 - OpenJDK version 14 - openjdk@1.17 OpenJDK version 17 @@ -434,14 +386,12 @@ pipeline { triggers { // schedules only run against release branches (i.e. 3.x, 4.x, 4.5.x, etc.) parameterizedCron(branchPatternCron().matcher(env.BRANCH_NAME).matches() ? """ + # All tests below should run against a common collection of backend servers # Every weekend (Saturday, Sunday) around 2:00 AM - ### JDK8 tests against 2.1, 3.0, 4.0, DSE 4.8, DSE 5.0, DSE 5.1, dse-6.0.18 and DSE 6.7 - H 2 * * 0 %CI_SCHEDULE=WEEKENDS;CI_SCHEDULE_SERVER_VERSIONS=2.1 3.0 4.0 dse-4.8.16 dse-5.0.15 dse-5.1.35 dse-6.0.18 dse-6.7.17;CI_SCHEDULE_JABBA_VERSION=1.8 + H 2 * * 0 %CI_SCHEDULE=WEEKENDS;CI_SCHEDULE_SERVER_VERSIONS=3.11 4.1 5.0 dse-6.8.30 dse-6.9.0 hcd-1.0.0;CI_SCHEDULE_JABBA_VERSION=1.8 # Every weeknight (Monday - Friday) around 12:00 PM noon - ### JDK11 tests against 3.11, 4.1, 5.0-beta1 and DSE 6.8 - H 12 * * 1-5 %CI_SCHEDULE=WEEKNIGHTS;CI_SCHEDULE_SERVER_VERSIONS=3.11 4.1 5.0-beta1 dse-6.8.30 dse-6.9.0 hcd-1.0.0;CI_SCHEDULE_JABBA_VERSION=openjdk@1.11 - ### JDK17 tests against 3.11, 4.1, 5.0-beta1 and DSE 6.8 - H 12 * * 1-5 %CI_SCHEDULE=WEEKNIGHTS;CI_SCHEDULE_SERVER_VERSIONS=3.11 4.1 5.0-beta1 dse-6.8.30 dse-6.9.0 hcd-1.0.0;CI_SCHEDULE_JABBA_VERSION=openjdk@1.17 + H 12 * * 1-5 %CI_SCHEDULE=WEEKNIGHTS;CI_SCHEDULE_SERVER_VERSIONS=3.11 4.1 5.0 dse-6.8.30 dse-6.9.0 hcd-1.0.0;CI_SCHEDULE_JABBA_VERSION=openjdk@1.11 + H 12 * * 1-5 %CI_SCHEDULE=WEEKNIGHTS;CI_SCHEDULE_SERVER_VERSIONS=3.11 4.1 5.0 dse-6.8.30 dse-6.9.0 hcd-1.0.0;CI_SCHEDULE_JABBA_VERSION=openjdk@1.17 """ : "") } @@ -590,12 +540,8 @@ pipeline { '3.11', // Previous Apache CassandraⓇ '4.0', // Previous Apache CassandraⓇ '4.1', // Current Apache CassandraⓇ - '5.0-beta1', // Development Apache CassandraⓇ - 'dse-4.8.16', // Previous EOSL DataStax Enterprise - 'dse-5.0.15', // Last EOSL DataStax Enterprise + '5.0', // Development Apache CassandraⓇ 'dse-5.1.35', // Legacy DataStax Enterprise - 'dse-6.0.18', // Previous DataStax Enterprise - 'dse-6.7.17', // Previous DataStax Enterprise 'dse-6.8.30', // Current DataStax Enterprise 'dse-6.9.0', // Current DataStax Enterprise 'hcd-1.0.0' // Current DataStax HCD