Skip to content

Commit 46555cb

Browse files
weideng1weideng1
authored
Initial PR to introduce new platform, i.e. Jammy as base OS and newer NodeJS versions (#406)
* updated OS from bionic to jammy * adjusted test matrix for C*/DSE versions and NodeJS versions * dropped all inactive nodejs versions from the test matrix, only remaining ones are 16, 18 and 20
1 parent d29e631 commit 46555cb

File tree

2 files changed

+13
-82
lines changed

2 files changed

+13
-82
lines changed

‎Jenkinsfile

Lines changed: 12 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44
def initializeEnvironment() {
5-
def nodeVersions = ['8': '8.16.2', '10': '10.17.0', '12': '12.13.0']
5+
def nodeVersions = ['16': '16.20.2', '18': '18.17.1', '20': '20.5.1']
66
env.DRIVER_DISPLAY_NAME = 'Cassandra Node.js Driver'
77
env.DRIVER_METRIC_TYPE = 'oss'
88
if (env.GIT_URL.contains('riptano/nodejs-driver')) {
@@ -234,16 +234,14 @@ pipeline {
234234
</table>''')
235235
choice(
236236
name: 'ADHOC_BUILD_AND_EXECUTE_TESTS_NODEJS_VERSION',
237-
choices: ['8', '10', '12.13.0', 'ALL'],
237+
choices: ['16', '18', '20', 'ALL'],
238238
description: 'Node.js version to use for adhoc <b>BUILD-AND-EXECUTE-TESTS</b> <strong>ONLY!</strong>')
239239
choice(
240240
name: 'ADHOC_BUILD_AND_EXECUTE_TESTS_SERVER_VERSION',
241-
choices: ['2.1', // Legacy Apache Cassandra
241+
choices: [
242242
'3.11', // Current Apache Cassandra
243243
'4.0', // Development Apache Cassandra
244244
'dse-5.1.35', // Legacy DataStax Enterprise
245-
'dse-6.0.18', // Previous DataStax Enterprise
246-
'dse-6.7.17', // Current DataStax Enterprise
247245
'dse-6.8.30', // Development DataStax Enterprise
248246
'ALL'],
249247
description: '''Apache Cassandra and DataStax Enterprise server version to use for adhoc <b>BUILD-AND-EXECUTE-TESTS</b> <strong>ONLY!</strong>
@@ -254,10 +252,6 @@ pipeline {
254252
<th align="left">Choice</th>
255253
<th align="left">Description</th>
256254
</tr>
257-
<tr>
258-
<td><strong>2.1</strong></td>
259-
<td>Apache Cassandra v2.1.x</td>
260-
</tr>
261255
<tr>
262256
<td><strong>3.11</strong></td>
263257
<td>Apache Cassandra v3.11.x</td>
@@ -270,14 +264,6 @@ pipeline {
270264
<td><strong>dse-5.1</strong></td>
271265
<td>DataStax Enterprise v5.1.x</td>
272266
</tr>
273-
<tr>
274-
<td><strong>dse-6.0</strong></td>
275-
<td>DataStax Enterprise v6.0.x</td>
276-
</tr>
277-
<tr>
278-
<td><strong>dse-6.7</strong></td>
279-
<td>DataStax Enterprise v6.7.x</td>
280-
</tr>
281267
<tr>
282268
<td><strong>dse-6.8</strong></td>
283269
<td>DataStax Enterprise v6.8.x (<b>CURRENTLY UNDER DEVELOPMENT</b>)</td>
@@ -309,7 +295,7 @@ pipeline {
309295
}
310296

311297
environment {
312-
OS_VERSION = 'ubuntu/bionic64/nodejs-driver'
298+
OS_VERSION = 'ubuntu/jammy64/nodejs-driver'
313299
JUNIT_REPORT_STACK = "${params.JUNIT_REPORT_STACK ? '1' : '0'}"
314300
JUNIT_REPORT_PATH = '.'
315301
TEST_TRACE = "${params.TEST_TRACE ? 'on' : 'off'}"
@@ -333,50 +319,14 @@ pipeline {
333319
axes {
334320
axis {
335321
name 'CASSANDRA_VERSION'
336-
values '2.1', // Legacy Apache Cassandra
337-
'3.11', // Current Apache Cassandra
322+
values '3.11', // Current Apache Cassandra
338323
'4.0', // Development Apache Cassandra
339324
'dse-5.1.35', // Legacy DataStax Enterprise
340-
'dse-6.0.18', // Previous DataStax Enterprise
341-
'dse-6.7.17', // Current DataStax Enterprise
342325
'dse-6.8.30' // Development DataStax Enterprise
343326
}
344327
axis {
345328
name 'NODEJS_VERSION'
346-
values '8', '10', '12'
347-
}
348-
}
349-
350-
excludes {
351-
exclude {
352-
axis {
353-
name 'NODEJS_VERSION'
354-
values '8'
355-
}
356-
axis {
357-
name 'CASSANDRA_VERSION'
358-
values '3.11', '4.0', 'dse-5.1.35', 'dse-6.8.30'
359-
}
360-
}
361-
exclude {
362-
axis {
363-
name 'NODEJS_VERSION'
364-
values '10'
365-
}
366-
axis {
367-
name 'CASSANDRA_VERSION'
368-
values '2.1', '4.0', 'dse-5.1.35', 'dse-6.0.18', 'dse-6.7.17'
369-
}
370-
}
371-
exclude {
372-
axis {
373-
name 'NODEJS_VERSION'
374-
values '12'
375-
}
376-
axis {
377-
name 'CASSANDRA_VERSION'
378-
values '2.1', '3.11', 'dse-6.0.18', 'dse-6.8.30'
379-
}
329+
values '16', '18', '20'
380330
}
381331
}
382332

@@ -424,7 +374,7 @@ pipeline {
424374
}
425375
stage('Execute-Examples') {
426376
when {
427-
expression { env.CASSANDRA_VERSION == 'dse-6.7.17' }
377+
expression { env.CASSANDRA_VERSION == 'dse-6.8.30' }
428378
}
429379
steps {
430380
executeExamples()
@@ -462,30 +412,14 @@ pipeline {
462412
axes {
463413
axis {
464414
name 'CASSANDRA_VERSION'
465-
values '2.1', // Legacy Apache Cassandra
466-
'3.11', // Current Apache Cassandra
415+
values '3.11', // Current Apache Cassandra
467416
'4.0', // Development Apache Cassandra
468417
'dse-5.1.35', // Legacy DataStax Enterprise
469-
'dse-6.0.18', // Previous DataStax Enterprise
470-
'dse-6.7.17', // Current DataStax Enterprise
471418
'dse-6.8.30' // Development DataStax Enterprise
472419
}
473420
axis {
474421
name 'NODEJS_VERSION'
475-
values '8', '10', '12'
476-
}
477-
}
478-
479-
excludes {
480-
exclude {
481-
axis {
482-
name 'NODEJS_VERSION'
483-
values '10'
484-
}
485-
axis {
486-
name 'CASSANDRA_VERSION'
487-
values '2.1', '3.11', '4.0', 'dse-5.1.35', 'dse-6.0.18', 'dse-6.7.17'
488-
}
422+
values '16', '18', '20'
489423
}
490424
}
491425

@@ -533,7 +467,7 @@ pipeline {
533467
}
534468
stage('Execute-Examples') {
535469
when {
536-
expression { env.CASSANDRA_VERSION == 'dse-6.7.17' }
470+
expression { env.CASSANDRA_VERSION == 'dse-6.8.30' }
537471
}
538472
steps {
539473
executeExamples()
@@ -569,17 +503,14 @@ pipeline {
569503
axes {
570504
axis {
571505
name 'CASSANDRA_VERSION'
572-
values '2.1', // Legacy Apache Cassandra
573-
'3.11', // Current Apache Cassandra
506+
values '3.11', // Current Apache Cassandra
574507
'4.0', // Development Apache Cassandra
575508
'dse-5.1.35', // Legacy DataStax Enterprise
576-
'dse-6.0.18', // Previous DataStax Enterprise
577-
'dse-6.7.17', // Current DataStax Enterprise
578509
'dse-6.8.30' // Development DataStax Enterprise
579510
}
580511
axis {
581512
name 'NODEJS_VERSION'
582-
values '8', '10', '12'
513+
values '16', '18', '20'
583514
}
584515
}
585516
when {

‎build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ nodejs:
3131
- '10'
3232
- '12'
3333
os:
34-
- ubuntu/bionic64/nodejs-driver
34+
- ubuntu/jammy64/nodejs-driver
3535
cassandra:
3636
- '2.1'
3737
- '3.11'

0 commit comments

Comments
 (0)