Skip to content

Commit 9cfb4f6

Browse files
lukasz-antoniakabsurdfarce
authored andcommitted
Run integration tests with DSE 6.9.0
patch by Lukasz Antoniak; reviewed by Bret McGuire reference: #1955
1 parent 5ee12ac commit 9cfb4f6

File tree

3 files changed

+16
-7
lines changed

3 files changed

+16
-7
lines changed

Jenkinsfile

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@ pipeline {
268268
'dse-6.0.18', // Previous DataStax Enterprise
269269
'dse-6.7.17', // Previous DataStax Enterprise
270270
'dse-6.8.30', // Current DataStax Enterprise
271+
'dse-6.9.0', // Current DataStax Enterprise
271272
'ALL'],
272273
description: '''Apache Cassandra&reg; and DataStax Enterprise server version to use for adhoc <b>BUILD-AND-EXECUTE-TESTS</b> builds
273274
<table style="width:100%">
@@ -325,6 +326,10 @@ pipeline {
325326
<td><strong>dse-6.8.30</strong></td>
326327
<td>DataStax Enterprise v6.8.x</td>
327328
</tr>
329+
<tr>
330+
<td><strong>dse-6.9.0</strong></td>
331+
<td>DataStax Enterprise v6.9.x</td>
332+
</tr>
328333
</table>''')
329334
choice(
330335
name: 'ADHOC_BUILD_AND_EXECUTE_TESTS_JABBA_VERSION',
@@ -416,9 +421,9 @@ pipeline {
416421
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
417422
# Every weeknight (Monday - Friday) around 12:00 PM noon
418423
### JDK11 tests against 3.11, 4.1, 5.0-beta1 and DSE 6.8
419-
H 12 * * 1-5 %CI_SCHEDULE=WEEKNIGHTS;CI_SCHEDULE_SERVER_VERSIONS=3.11 4.1 5.0-beta1 dse-6.8.30;CI_SCHEDULE_JABBA_VERSION=openjdk@1.11
424+
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;CI_SCHEDULE_JABBA_VERSION=openjdk@1.11
420425
### JDK17 tests against 3.11, 4.1, 5.0-beta1 and DSE 6.8
421-
H 12 * * 1-5 %CI_SCHEDULE=WEEKNIGHTS;CI_SCHEDULE_SERVER_VERSIONS=3.11 4.1 5.0-beta1 dse-6.8.30;CI_SCHEDULE_JABBA_VERSION=openjdk@1.17
426+
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;CI_SCHEDULE_JABBA_VERSION=openjdk@1.17
422427
""" : "")
423428
}
424429

@@ -452,9 +457,10 @@ pipeline {
452457
axes {
453458
axis {
454459
name 'SERVER_VERSION'
455-
values '3.11', // Latest stable Apache CassandraⓇ
456-
'4.1', // Development Apache CassandraⓇ
457-
'dse-6.8.30' // Current DataStax Enterprise
460+
values '3.11', // Latest stable Apache CassandraⓇ
461+
'4.1', // Development Apache CassandraⓇ
462+
'dse-6.8.30', // Current DataStax Enterprise
463+
'dse-6.9.0' // Current DataStax Enterprise
458464
}
459465
axis {
460466
name 'JABBA_VERSION'
@@ -571,7 +577,8 @@ pipeline {
571577
'dse-5.1.35', // Legacy DataStax Enterprise
572578
'dse-6.0.18', // Previous DataStax Enterprise
573579
'dse-6.7.17', // Previous DataStax Enterprise
574-
'dse-6.8.30' // Current DataStax Enterprise
580+
'dse-6.8.30', // Current DataStax Enterprise
581+
'dse-6.9.0' // Current DataStax Enterprise
575582
}
576583
}
577584
when {

core/src/main/java/com/datastax/oss/driver/api/core/Version.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public class Version implements Comparable<Version>, Serializable {
5656
@NonNull public static final Version V5_0_0 = Objects.requireNonNull(parse("5.0.0"));
5757
@NonNull public static final Version V6_7_0 = Objects.requireNonNull(parse("6.7.0"));
5858
@NonNull public static final Version V6_8_0 = Objects.requireNonNull(parse("6.8.0"));
59+
@NonNull public static final Version V6_9_0 = Objects.requireNonNull(parse("6.9.0"));
5960

6061
private final int major;
6162
private final int minor;

test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/CcmBridge.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,8 @@ private Optional<Integer> overrideJvmVersionForDseWorkloads() {
479479
return Optional.empty();
480480
}
481481

482-
if (getDseVersion().get().compareTo(Version.parse("6.8.19")) < 0) {
482+
if (getDseVersion().get().compareTo(Version.V6_9_0) >= 0) {
483+
// DSE 6.9.0 supports only JVM 11 onwards (also with graph workload)
483484
return Optional.empty();
484485
}
485486

0 commit comments

Comments
 (0)