JAVA-2622: Add Cassandra 4.0 to build matrix for ITs (apache#1390)

emerkle826 · web-flow · commit 6cd2d8f8a9a4 · 2020-01-24T08:10:29.000-06:00
- also fixes the build.yaml for CI builds
diff --git a/build.yaml b/build.yaml
@@ -9,6 +9,7 @@ cassandra:
   - '2.1'
   - '3.0'
   - '3.11'
+  - '4.0'
   - 'dse-4.8'
   - 'dse-5.0'
   - 'dse-5.1'
@@ -27,41 +28,45 @@ schedules:
         - jabba: openjdk_jdk11
         - jabba: openjdk_jdk12
         - jabba: openjdk_jdk13
+    disable_commit_status: true
+    notify:
+      slack: java-driver-dev-bots
   nightly:
     schedule: nightly
     matrix:
       exclude:
         # No excludes for JDK8
         # Exclude JDK11 for all but the latest Cassandra and DSE 6.7+
         - jabba: openjdk_jdk11
-          cassandra: ['2.1', '3.0', 'dse-4.8', 'dse-5.0', 'dse-5.1', 'dse-6.0', dse-6.8']
+          cassandra: ['2.1', '3.0', 'dse-4.8', 'dse-5.0', 'dse-5.1', 'dse-6.0', 'dse-6.8']
         # Exclude JDK12 for all but the latest Cassandra and DSE 6.7+
         - jabba: openjdk_jdk12
-          cassandra: ['2.1', '3.0', 'dse-4.8', 'dse-5.0', 'dse-5.1', 'dse-6.0', dse-6.8']
+          cassandra: ['2.1', '3.0', 'dse-4.8', 'dse-5.0', 'dse-5.1', 'dse-6.0', 'dse-6.8']
         # Exclude JDK13 for all but the latest Cassandra and DSE 6.7+
         - jabba: openjdk_jdk13
-          cassandra: ['2.1', '3.0', 'dse-4.8', 'dse-5.0', 'dse-5.1', 'dse-6.0', dse-6.8']
+          cassandra: ['2.1', '3.0', 'dse-4.8', 'dse-5.0', 'dse-5.1', 'dse-6.0', 'dse-6.8']
+    disable_commit_status: true
+    notify:
+      slack: java-driver-dev-bots
+
   adhoc:
     schedule: adhoc
     matrix:
       exclude:
         # No excludes for JDK8
         # Exclude JDK11 for all but the latest Cassandra and DSE 6.7+
         - jabba: openjdk_jdk11
-          cassandra: ['2.1', '3.0', 'dse-4.8', 'dse-5.0', 'dse-5.1', 'dse-6.0', dse-6.8']
+          cassandra: ['2.1', '3.0', 'dse-4.8', 'dse-5.0', 'dse-5.1', 'dse-6.0', 'dse-6.8']
         # Exclude JDK12 for all but the latest Cassandra and DSE 6.7+
         - jabba: openjdk_jdk12
-          cassandra: ['2.1', '3.0', 'dse-4.8', 'dse-5.0', 'dse-5.1', 'dse-6.0', dse-6.8']
+          cassandra: ['2.1', '3.0', 'dse-4.8', 'dse-5.0', 'dse-5.1', 'dse-6.0', 'dse-6.8']
         # Exclude JDK13 for all but the latest Cassandra and DSE 6.7+
         - jabba: openjdk_jdk13
-          cassandra: ['2.1', '3.0', 'dse-4.8', 'dse-5.0', 'dse-5.1', 'dse-6.0', dse-6.8']
+          cassandra: ['2.1', '3.0', 'dse-4.8', 'dse-5.0', 'dse-5.1', 'dse-6.0', 'dse-6.8']
+    disable_commit_status: true
+    notify:
+      slack: java-driver-dev-bots
 build:
-  - type: maven
-  - properties: |
-      ccm.version=$CCM_CASSANDRA_VERSION
-      ccm.dse=$CCM_IS_DSE
-      proxy.path=$HOME/proxy
-      maven.javadoc.skip=true
   - script: |
       # Jabba default should be a JDK8 for now
       jabba use default
@@ -72,11 +77,8 @@ build:
       # Use the matrix JDK for testing
       jabba use $JABBA_JDK_NAME
       # Run tests against matrix JDK
-      mvn -B -V verify --batch-mode --show-version
+      mvn -B -V verify --batch-mode --show-version -Dccm.version=$CCM_CASSANDRA_VERSION -Dccm.dse=$CCM_IS_DSE -Dproxy.path=$HOME/proxy -Dmaven.javadoc.skip=true
   - xunit:
     - "**/target/surefire-reports/TEST-*.xml"
     - "**/target/failsafe-reports/TEST-*.xml"
   - jacoco: true
-disable_commit_status: true
-notify:
-  slack: java-driver-dev-bots
diff --git a/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/CcmBridge.java b/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/CcmBridge.java
@@ -186,6 +186,24 @@ public Version getCassandraVersion() {
     }
   }
 
+  private String getCcmVersionString(Version version) {
+    // for 4.0 pre-releases, the CCM version string needs to be "4.0-alpha1" or "4.0-alpha2"
+    // Version.toString() always adds a patch value, even if it's not specified when parsing.
+    if (version.getMajor() == 4
+        && version.getMinor() == 0
+        && version.getPatch() == 0
+        && version.getPreReleaseLabels() != null) {
+      // truncate the patch version from the Version string
+      StringBuilder sb = new StringBuilder();
+      sb.append(version.getMajor()).append('.').append(version.getMinor());
+      for (String preReleaseString : version.getPreReleaseLabels()) {
+        sb.append('-').append(preReleaseString);
+      }
+      return sb.toString();
+    }
+    return version.toString();
+  }
+
   public void create() {
     if (created.compareAndSet(false, true)) {
       if (INSTALL_DIRECTORY != null) {
@@ -194,7 +212,7 @@ public void create() {
         createOptions.add("-v git:" + BRANCH.trim().replaceAll("\"", ""));
 
       } else {
-        createOptions.add("-v " + VERSION.toString());
+        createOptions.add("-v " + getCcmVersionString(VERSION));
       }
       if (DSE_ENABLEMENT) {
         createOptions.add("--dse");
