Skip to content

Commit 62cea5a

Browse files
committed
Move Apache Cassandra 5.x off of beta1 and remove some older Apache Cassandra versions.
patch by Bret McGuire; reviewed by Bret McGuire for CASSJAVA-54
1 parent e843786 commit 62cea5a

File tree

1 file changed

+15
-37
lines changed

1 file changed

+15
-37
lines changed

Jenkinsfile-datastax

Lines changed: 15 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -268,13 +268,9 @@ pipeline {
268268
</table>''')
269269
choice(
270270
name: 'ADHOC_BUILD_AND_EXECUTE_TESTS_SERVER_VERSION',
271-
choices: ['2.1', // Legacy Apache CassandraⓇ
272-
'2.2', // Legacy Apache CassandraⓇ
273-
'3.0', // Previous Apache CassandraⓇ
274-
'3.11', // Previous Apache CassandraⓇ
275-
'4.0', // Previous Apache CassandraⓇ
276-
'4.1', // Current Apache CassandraⓇ
277-
'5.0-beta1', // Development Apache CassandraⓇ
271+
choices: ['4.0', // Previous Apache CassandraⓇ
272+
'4.1', // Previous Apache CassandraⓇ
273+
'5.0', // Current Apache CassandraⓇ
278274
'dse-4.8.16', // Previous EOSL DataStax Enterprise
279275
'dse-5.0.15', // Long Term Support DataStax Enterprise
280276
'dse-5.1.35', // Legacy DataStax Enterprise
@@ -292,22 +288,6 @@ pipeline {
292288
<th align="left">Choice</th>
293289
<th align="left">Description</th>
294290
</tr>
295-
<tr>
296-
<td><strong>2.1</strong></td>
297-
<td>Apache Cassandra&reg; v2.1.x</td>
298-
</tr>
299-
<tr>
300-
<td><strong>2.2</strong></td>
301-
<td>Apache Cassandra&reg; v2.2.x</td>
302-
</tr>
303-
<tr>
304-
<td><strong>3.0</strong></td>
305-
<td>Apache Cassandra&reg; v3.0.x</td>
306-
</tr>
307-
<tr>
308-
<td><strong>3.11</strong></td>
309-
<td>Apache Cassandra&reg; v3.11.x</td>
310-
</tr>
311291
<tr>
312292
<td><strong>4.0</strong></td>
313293
<td>Apache Cassandra&reg; v4.0.x</td>
@@ -316,6 +296,10 @@ pipeline {
316296
<td><strong>4.1</strong></td>
317297
<td>Apache Cassandra&reg; v4.1.x</td>
318298
</tr>
299+
<tr>
300+
<td><strong>5.0</strong></td>
301+
<td>Apache Cassandra&reg; v5.0.x</td>
302+
</tr>
319303
<tr>
320304
<td><strong>dse-4.8.16</strong></td>
321305
<td>DataStax Enterprise v4.8.x (<b>END OF SERVICE LIFE</b>)</td>
@@ -435,13 +419,10 @@ pipeline {
435419
// schedules only run against release branches (i.e. 3.x, 4.x, 4.5.x, etc.)
436420
parameterizedCron(branchPatternCron().matcher(env.BRANCH_NAME).matches() ? """
437421
# Every weekend (Saturday, Sunday) around 2:00 AM
438-
### 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
439-
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
422+
H 2 * * 0 %CI_SCHEDULE=WEEKENDS;CI_SCHEDULE_SERVER_VERSIONS=4.0 4.1 5.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
440423
# Every weeknight (Monday - Friday) around 12:00 PM noon
441-
### JDK11 tests against 3.11, 4.1, 5.0-beta1 and DSE 6.8
442-
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;[email protected]
443-
### JDK17 tests against 3.11, 4.1, 5.0-beta1 and DSE 6.8
444-
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;[email protected]
424+
H 12 * * 1-5 %CI_SCHEDULE=WEEKNIGHTS;CI_SCHEDULE_SERVER_VERSIONS=4.1 5.0 dse-6.8.30 dse-6.9.0 hcd-1.0.0;[email protected]
425+
H 12 * * 1-5 %CI_SCHEDULE=WEEKNIGHTS;CI_SCHEDULE_SERVER_VERSIONS=4.1 5.0 dse-6.8.30 dse-6.9.0 hcd-1.0.0;[email protected]
445426
""" : "")
446427
}
447428

@@ -475,8 +456,8 @@ pipeline {
475456
axes {
476457
axis {
477458
name 'SERVER_VERSION'
478-
values '3.11', // Latest stable Apache CassandraⓇ
479-
'4.1', // Development Apache CassandraⓇ
459+
values '4.0', // Previous Apache CassandraⓇ
460+
'5.0', // Current Apache CassandraⓇ
480461
'dse-6.8.30', // Current DataStax Enterprise
481462
'dse-6.9.0', // Current DataStax Enterprise
482463
'hcd-1.0.0' // Current DataStax HCD
@@ -585,12 +566,9 @@ pipeline {
585566
axes {
586567
axis {
587568
name 'SERVER_VERSION'
588-
values '2.1', // Legacy Apache CassandraⓇ
589-
'3.0', // Previous Apache CassandraⓇ
590-
'3.11', // Previous Apache CassandraⓇ
591-
'4.0', // Previous Apache CassandraⓇ
592-
'4.1', // Current Apache CassandraⓇ
593-
'5.0-beta1', // Development Apache CassandraⓇ
569+
values '4.0', // Previous Apache CassandraⓇ
570+
'4.1', // Previous Apache CassandraⓇ
571+
'5.0', // Current Apache CassandraⓇ
594572
'dse-4.8.16', // Previous EOSL DataStax Enterprise
595573
'dse-5.0.15', // Last EOSL DataStax Enterprise
596574
'dse-5.1.35', // Legacy DataStax Enterprise

0 commit comments

Comments
 (0)