Skip to content

Run integration tests with DSE 6.9.0 #1955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 9, 2024
Merged

Run integration tests with DSE 6.9.0 #1955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,7 @@ pipeline {
'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
'ALL'],
description: '''Apache Cassandra&reg; and DataStax Enterprise server version to use for adhoc <b>BUILD-AND-EXECUTE-TESTS</b> builds
<table style="width:100%">
Expand Down Expand Up @@ -325,6 +326,10 @@ pipeline {
<td><strong>dse-6.8.30</strong></td>
<td>DataStax Enterprise v6.8.x</td>
</tr>
<tr>
<td><strong>dse-6.9.0</strong></td>
<td>DataStax Enterprise v6.9.x</td>
</tr>
</table>''')
choice(
name: 'ADHOC_BUILD_AND_EXECUTE_TESTS_JABBA_VERSION',
Expand Down Expand Up @@ -416,9 +421,9 @@ pipeline {
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
# 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;[email protected]
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;[email protected]
### 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;[email protected]
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;[email protected]
""" : "")
}

Expand Down Expand Up @@ -452,9 +457,10 @@ pipeline {
axes {
axis {
name 'SERVER_VERSION'
values '3.11', // Latest stable Apache CassandraⓇ
'4.1', // Development Apache CassandraⓇ
'dse-6.8.30' // Current DataStax Enterprise
values '3.11', // Latest stable Apache CassandraⓇ
'4.1', // Development Apache CassandraⓇ
'dse-6.8.30', // Current DataStax Enterprise
'dse-6.9.0' // Current DataStax Enterprise
}
axis {
name 'JABBA_VERSION'
Expand Down Expand Up @@ -571,7 +577,8 @@ pipeline {
'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.8.30', // Current DataStax Enterprise
'dse-6.9.0' // Current DataStax Enterprise
}
}
when {
Expand Down
1 change: 1 addition & 0 deletions core/src/main/java/com/datastax/oss/driver/api/core/Version.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ public class Version implements Comparable<Version>, Serializable {
@NonNull public static final Version V5_0_0 = Objects.requireNonNull(parse("5.0.0"));
@NonNull public static final Version V6_7_0 = Objects.requireNonNull(parse("6.7.0"));
@NonNull public static final Version V6_8_0 = Objects.requireNonNull(parse("6.8.0"));
@NonNull public static final Version V6_9_0 = Objects.requireNonNull(parse("6.9.0"));

private final int major;
private final int minor;
Expand Down
3 changes: 2 additions & 1 deletion test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/CcmBridge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,8 @@ private Optional<Integer> overrideJvmVersionForDseWorkloads() {
return Optional.empty();
}

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

Expand Down