NODEJS-674: NODEJS-677: NODEJS-678: NODEJS-679: CI for C* 4.1, 5.0, DSE-6.9, and HCD

Jenkinsfile

@@ -2,7 +2,7 @@
 
 
 def initializeEnvironment() {
-  def nodeVersions = ['16': '16.20.2', '18': '18.17.1', '20': '20.5.1']
+  def nodeVersions = ['18': '18.20.4', '20': '20.17.0', '22': '22.8.0']
   env.DRIVER_DISPLAY_NAME = 'Cassandra Node.js Driver'
   env.DRIVER_METRIC_TYPE = 'oss'
   if (env.GIT_URL.contains('riptano/nodejs-driver')) {
@@ -19,6 +19,9 @@ def initializeEnvironment() {
   env.GITHUB_COMMIT_URL = "${GITHUB_PROJECT_URL}/commit/${env.GIT_COMMIT}"
   env.NODEJS_VERSION_FULL = nodeVersions[env.NODEJS_VERSION]
 
+  env.JAVA8_HOME="${JABBA_HOME}/jdk/1.8"
+  env.JAVA11_HOME="${JABBA_HOME}/jdk/openjdk@1.11"
+
   sh label: 'Assign Node.js global environment', script: '''#!/bin/bash -lex
     nodenv versions
     echo "Using Node.js runtime ${NODEJS_VERSION} (${NODEJS_VERSION_FULL})"
@@ -38,13 +41,25 @@ CCM_CASSANDRA_VERSION=${DSE_FIXED_VERSION} # maintain for backwards compatibilit
 CCM_VERSION=${DSE_FIXED_VERSION}
 CCM_SERVER_TYPE=dse
 DSE_VERSION=${DSE_FIXED_VERSION}
-CCM_IS_DSE=true
+CCM_DISTRIBUTION=dse
 CCM_BRANCH=${DSE_FIXED_VERSION}
 DSE_BRANCH=${DSE_FIXED_VERSION}
 ENVIRONMENT_EOF
       '''
   }
 
+  if (env.CASSANDRA_VERSION.split('-')[0] == 'hcd'){
+    env.HCD_FIXED_VERSION = env.CASSANDRA_VERSION.split('-')[1]
+    sh label: 'Update environment for HCD', script: '''#!/bin/bash -le
+        cat >> ${HOME}/environment.txt << ENVIRONMENT_EOF
+CCM_PATH=${HOME}/ccm
+CCM_CASSANDRA_VERSION=${HCD_FIXED_VERSION} # maintain for backwards compatibility
+CCM_VERSION=${HCD_FIXED_VERSION}
+CCM_DISTRIBUTION=hcd
+ENVIRONMENT_EOF
+      '''
+  }
+
   sh label: 'Display Node.js and environment information', script: '''#!/bin/bash -le
     # Load CCM environment variables
     set -o allexport
@@ -201,6 +216,12 @@ def describeAdhocTestingStage() {
   }
 }
 
+def describeInstallAndLint(){
+  describePerCommitStage()
+  installDriverAndDependencies()
+  executeLinter()
+}
+
 // branch pattern for cron
 def branchPatternCron() {
   ~"(master)"
@@ -240,15 +261,19 @@ pipeline {
                       </table>''')
     choice(
       name: 'ADHOC_BUILD_AND_EXECUTE_TESTS_NODEJS_VERSION',
-      choices: ['16', '18', '20', 'ALL'],
+      choices: ['18', '20', '22', 'ALL'],
       description: 'Node.js version to use for adhoc <b>BUILD-AND-EXECUTE-TESTS</b> <strong>ONLY!</strong>')
     choice(
       name: 'ADHOC_BUILD_AND_EXECUTE_TESTS_SERVER_VERSION',
       choices: [
-                '3.11',    // Current Apache Cassandra
-                '4.0',     // Development Apache Cassandra
+                '3.11',    // Previous Apache Cassandra
+                '4.0',     // Previous Apache Cassandra
+                '4.1',    // Previous Apache Cassandra 
+                '5.0', // Current Apache Cassandra
                 'dse-5.1.35', // Legacy DataStax Enterprise
-                'dse-6.8.30', // Development DataStax Enterprise
+                'dse-6.8.30', // Previoius DataStax Enterprise
+                'dse-6.9.0', // Current DataStax Enterprise
+                'hcd-1.0.0', // HCD
                 'ALL'],
       description: '''Apache Cassandra and DataStax Enterprise server version to use for adhoc <b>BUILD-AND-EXECUTE-TESTS</b> <strong>ONLY!</strong>
                       <table style="width:100%">
@@ -326,14 +351,16 @@ pipeline {
         axes {
           axis {
             name 'CASSANDRA_VERSION'
-            values '3.11',    // Current Apache Cassandra
-                   '4.0',     // Development Apache Cassandra
-                   'dse-5.1.35', // Legacy DataStax Enterprise
-                   'dse-6.8.30' // Development DataStax Enterprise
+            values '3.11',    // Previous Apache Cassandra
+                   '4.1',    // Previous Apache Cassandra 
+                   '5.0', // Current Apache Cassandra
+                   'dse-6.8.30', // Previous DataStax Enterprise
+                   'dse-6.9.0', // Current DataStax Enterprise
+                   'hcd-1.0.0' // HCD
           }
           axis {
             name 'NODEJS_VERSION'
-            values '16', '18', '20'
+            values '18', '20', '22'
           }
         }
 
@@ -352,19 +379,9 @@ pipeline {
               }
             }
           }
-          stage('Describe-Build') {
+          stage('Describe-Install-And-Lint') {
             steps {
-              describePerCommitStage()
-            }
-          }
-          stage('Install-Driver-And-Dependencies') {
-            steps {
-              installDriverAndDependencies()
-            }
-          }
-          stage('Execute-Linter') {
-            steps {
-              executeLinter()
+              describeInstallAndLint()
             }
           }
           stage('Execute-Tests') {
@@ -419,14 +436,16 @@ pipeline {
         axes {
           axis {
             name 'CASSANDRA_VERSION'
-            values '3.11',    // Current Apache Cassandra
-                   '4.0',     // Development Apache Cassandra
-                   'dse-5.1.35', // Legacy DataStax Enterprise
-                   'dse-6.8.30' // Development DataStax Enterprise
+            values '3.11',    // Previous Apache Cassandra
+                   '4.1',    // Previous Apache Cassandra 
+                   '5.0', // Current Apache Cassandra 
+                   'dse-6.8.30', // Previous DataStax Enterprise
+                   'dse-6.9.0', // Current DataStax Enterprise
+                   'hcd-1.0.0' // HCD
           }
           axis {
             name 'NODEJS_VERSION'
-            values '16', '18', '20'
+            values '18', '20', '22'
           }
         }
 
@@ -445,19 +464,9 @@ pipeline {
               }
             }
           }
-          stage('Describe-Build') {
-            steps {
-              describeScheduledTestingStage()
-            }
-          }
-          stage('Install-Driver-And-Dependencies') {
-            steps {
-              installDriverAndDependencies()
-            }
-          }
-          stage('Execute-Linter') {
+          stage('Describe-Install-And-Lint') {
             steps {
-              executeLinter()
+              describeInstallAndLint()
             }
           }
           stage('Execute-Tests') {
@@ -486,12 +495,6 @@ pipeline {
         aborted {
           notifySlack('aborted')
         }
-        success {
-          notifySlack('completed')
-        }
-        unstable {
-          notifySlack('unstable')
-        }
         failure {
           notifySlack('FAILED')
         }
@@ -510,14 +513,17 @@ pipeline {
         axes {
           axis {
             name 'CASSANDRA_VERSION'
-            values '3.11',     // Current Apache Cassandra
-                   '4.0',      // Development Apache Cassandra
-                   'dse-5.1.35', // Legacy DataStax Enterprise
-                   'dse-6.8.30' // Development DataStax Enterprise
+            values '3.11',    // Previous Apache Cassandra
+                   '4.1',    // Previous Apache Cassandra 
+                   '5.0', // Current Apache Cassandra
+                   'dse-6.8.30', // Previous DataStax Enterprise
+                   'dse-6.9.0', // Current DataStax Enterprise
+                   'hcd-1.0.0' // HCD
+
           }
           axis {
             name 'NODEJS_VERSION'
-            values '16', '18', '20'
+            values '18', '20', '22'
           }
         }
         when {

package.json

@@ -21,7 +21,7 @@
   "types": "./index.d.ts",
   "dependencies": {
     "@types/long": "~5.0.0",
-    "@types/node": ">=8",
+    "@types/node": "^18.11.18",
     "adm-zip": "~0.5.10",
     "long": "~5.2.3"
   },

test/integration/short/control-connection-tests.js

@@ -121,7 +121,7 @@ describe('ControlConnection', function () {
 
       // While the host is started, it's not a given that it will have been connected and marked up,
       // wait for that to be the case.
-      await helper.wait.forNodeToBeAdded(cc.hosts, 3);
+      await helper.wait.forNodeToBeAdded(cc.hosts, 3, 5000, 200);
       await helper.wait.forNodeUp(cc.hosts, 3);
 
       const countUp = cc.hosts.values().reduce((value, host) => value + (host.isUp() ? 1 : 0), 0);
@@ -220,7 +220,7 @@ describe('ControlConnection', function () {
 
       // restart node 2 and make sure it comes up.
       await util.promisify(helper.ccmHelper.startNode)(2);
-      await helper.wait.forNodeUp(cc.hosts, 2);
+      await helper.wait.forNodeUp(cc.hosts, 2, 5000, 200);
 
       // check that host 1 is down, host 2 is up and the control connection is to host 2.
       cc.hosts.forEach(h => {
@@ -232,7 +232,7 @@ describe('ControlConnection', function () {
         }
       });
 
-      await helper.wait.until(() => cc.host);
+      await helper.wait.until(() => cc.host, 5000, 200);
 
       assert.strictEqual(helper.lastOctetOf(cc.host), '2');
     });

test/integration/short/geometry/polygon-tests.js

@@ -130,7 +130,12 @@ vdescribe('dse-5.0', 'Polygon @SERVER_API', function () {
                     normalizedCoordinates.push([c[0], c[2], c[1], c[3]]);
                   }
                 }
-                assert.deepEqual(normalizedCoordinates, polygon.toJSON().coordinates);
+                if (helper.isDseGreaterThan('6.9')) {
+                  //TODO: find documentation
+                  assert.deepEqual(value, polygon.toJSON());
+                }else{
+                  assert.deepEqual(normalizedCoordinates, polygon.toJSON().coordinates);
+                }
                 eachNext();
               });
             });

test/integration/short/graph/graph-olap-tests.js

@@ -134,15 +134,21 @@ vdescribe('dse-5.0', 'Client with spark workload', function () {
         {loadBalancing: new DefaultLoadBalancingPolicy(), graphOptions: {source: 'a'}})]}, true)
     );
     context('with no callback specified', function () {
-      it('should return a promise for OLAP query', function () {
-        const client = newInstance();
-        const p = client.executeGraph('g.V().count()', { graphSource: 'a' });
-        helper.assertInstanceOf(p, Promise);
-        return p.then(function (result) {
-          helper.assertInstanceOf(result, graphModule.GraphResultSet);
-          assert.strictEqual(typeof result.first(), 'number');
-        });
-      });
+      // if dse-6.9.0, skip this test because NODEJS-676 and DSP-24336
+      if (helper.getServerInfo().version === '6.9.0' && helper.getServerInfo().isDse) {
+        xit('should return a promise for OLAP query');
+      } else {
+        it(
+          'should return a promise for OLAP query', function () {
+            const client = newInstance();
+            const p = client.executeGraph('g.V().count()', { graphSource: 'a' });
+            helper.assertInstanceOf(p, Promise);
+            return p.then(function (result) {
+              helper.assertInstanceOf(result, graphModule.GraphResultSet);
+              assert.strictEqual(typeof result.first(), 'number');
+            });
+          });
+      }
     });
   });
 });

test/integration/short/graph/graph-tests.js

@@ -449,21 +449,26 @@ vdescribe('dse-5.0', 'Client @SERVER_API', function () {
               done();
             });
           }));
-          it('should retrieve a Int64 scalar', wrapClient(function (client, done) {
-            const query = JSON.stringify({
-              '@type': 'g:Bytecode',
-              '@value': {
-                'step': [["V"], ["count"]]
-              }
-            });
-            client.executeGraph(query, null, { graphLanguage: 'bytecode-json' }, function (err, result) {
-              assert.ifError(err);
-              helper.assertInstanceOf(result, graphModule.GraphResultSet);
-              const count = result.first();
-              helper.assertInstanceOf(count, types.Long);
-              done();
-            });
-          }));
+          // if dse-6.9.0, skip this test because NODEJS-676 and DSP-24336
+          if (helper.getServerInfo().version === '6.9.0' && helper.getServerInfo().isDse) {
+            it.skip('should retrieve a Int64 scalar');
+          } else {
+            it('should retrieve a Int64 scalar', wrapClient(function (client, done) {
+              const query = JSON.stringify({
+                '@type': 'g:Bytecode',
+                '@value': {
+                  'step': [["V"], ["count"]]
+                }
+              });
+              client.executeGraph(query, null, { graphLanguage: 'bytecode-json' }, function (err, result) {
+                assert.ifError(err);
+                helper.assertInstanceOf(result, graphModule.GraphResultSet);
+                const count = result.first();
+                helper.assertInstanceOf(count, types.Long);
+                done();
+              });
+            }));
+          }
           it('should allow graph language to be set from the execution profile', wrapClient(function (client, done) {
             const query = JSON.stringify({
               '@type': 'g:Bytecode',
@@ -480,7 +485,7 @@ vdescribe('dse-5.0', 'Client @SERVER_API', function () {
               });
               done();
             });
-          }, { profiles: [ new ExecutionProfile('graph-profile1', { graphOptions: { language: 'bytecode-json' } }) ]}));
+          }, { profiles: [new ExecutionProfile('graph-profile1', { graphOptions: { language: 'bytecode-json' } })] }));
         });
       });
       it('should use list as a parameter', wrapClient(function(client, done) {