Skip to content

Commit 3558444

Browse files
joao-r-reisjoao-r-reis
authored
fix dse builds on 4.x (#1625)
1 parent 1b455ff commit 3558444

1 file changed

Lines changed: 38 additions & 23 deletions

File tree

‎Jenkinsfile‎

Lines changed: 38 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,21 @@ def initializeEnvironment() {
3131
. ${CCM_ENVIRONMENT_SHELL} ${SERVER_VERSION}
3232
'''
3333

34+
if (env.SERVER_VERSION.split('-')[0] == 'dse') {
35+
env.DSE_FIXED_VERSION = env.SERVER_VERSION.split('-')[1]
36+
sh label: 'Update environment for DataStax Enterprise', script: '''#!/bin/bash -le
37+
cat >> ${HOME}/environment.txt << ENVIRONMENT_EOF
38+
CCM_CASSANDRA_VERSION=${DSE_FIXED_VERSION} # maintain for backwards compatibility
39+
CCM_VERSION=${DSE_FIXED_VERSION}
40+
CCM_SERVER_TYPE=dse
41+
DSE_VERSION=${DSE_FIXED_VERSION}
42+
CCM_IS_DSE=true
43+
CCM_BRANCH=${DSE_FIXED_VERSION}
44+
DSE_BRANCH=${DSE_FIXED_VERSION}
45+
ENVIRONMENT_EOF
46+
'''
47+
}
48+
3449
sh label: 'Display Java and environment information',script: '''#!/bin/bash -le
3550
# Load CCM environment variables
3651
set -o allexport
@@ -198,12 +213,12 @@ pipeline {
198213
'3.0', // Previous Apache CassandraⓇ
199214
'3.11', // Current Apache CassandraⓇ
200215
'4.0', // Development Apache CassandraⓇ
201-
'dse-4.8', // Previous EOSL DataStax Enterprise
202-
'dse-5.0', // Long Term Support DataStax Enterprise
203-
'dse-5.1', // Legacy DataStax Enterprise
204-
'dse-6.0', // Previous DataStax Enterprise
205-
'dse-6.7', // Previous DataStax Enterprise
206-
'dse-6.8', // Current DataStax Enterprise
216+
'dse-4.8.16', // Previous EOSL DataStax Enterprise
217+
'dse-5.0.15', // Long Term Support DataStax Enterprise
218+
'dse-5.1.35', // Legacy DataStax Enterprise
219+
'dse-6.0.18', // Previous DataStax Enterprise
220+
'dse-6.7.17', // Previous DataStax Enterprise
221+
'dse-6.8.30', // Current DataStax Enterprise
207222
'ALL'],
208223
description: '''Apache Cassandra&reg; and DataStax Enterprise server version to use for adhoc <b>BUILD-AND-EXECUTE-TESTS</b> builds
209224
<table style="width:100%">
@@ -234,27 +249,27 @@ pipeline {
234249
<td>Apache Cassandra&reg; v4.x (<b>CURRENTLY UNDER DEVELOPMENT</b>)</td>
235250
</tr>
236251
<tr>
237-
<td><strong>dse-4.8</strong></td>
252+
<td><strong>dse-4.8.16</strong></td>
238253
<td>DataStax Enterprise v4.8.x (<b>END OF SERVICE LIFE</b>)</td>
239254
</tr>
240255
<tr>
241-
<td><strong>dse-5.0</strong></td>
256+
<td><strong>dse-5.0.15</strong></td>
242257
<td>DataStax Enterprise v5.0.x (<b>Long Term Support</b>)</td>
243258
</tr>
244259
<tr>
245-
<td><strong>dse-5.1</strong></td>
260+
<td><strong>dse-5.1.35</strong></td>
246261
<td>DataStax Enterprise v5.1.x</td>
247262
</tr>
248263
<tr>
249-
<td><strong>dse-6.0</strong></td>
264+
<td><strong>dse-6.0.18</strong></td>
250265
<td>DataStax Enterprise v6.0.x</td>
251266
</tr>
252267
<tr>
253-
<td><strong>dse-6.7</strong></td>
268+
<td><strong>dse-6.7.17</strong></td>
254269
<td>DataStax Enterprise v6.7.x</td>
255270
</tr>
256271
<tr>
257-
<td><strong>dse-6.8</strong></td>
272+
<td><strong>dse-6.8.30</strong></td>
258273
<td>DataStax Enterprise v6.8.x</td>
259274
</tr>
260275
</table>''')
@@ -339,13 +354,13 @@ pipeline {
339354
// schedules only run against release branches (i.e. 3.x, 4.x, 4.5.x, etc.)
340355
parameterizedCron(branchPatternCron().matcher(env.BRANCH_NAME).matches() ? """
341356
# Every weeknight (Monday - Friday) around 2:00 AM
342-
### JDK8 tests against 2.1, 3.0, DSE 4.8, DSE 5.0, DSE 5.1, DSE-6.0 and DSE 6.7
343-
H 2 * * 1-5 %CI_SCHEDULE=WEEKNIGHTS;CI_SCHEDULE_SERVER_VERSIONS=2.1 3.0 dse-4.8 dse-5.0 dse-5.1 dse-6.0 dse-6.7;CI_SCHEDULE_JABBA_VERSION=1.8
357+
### JDK8 tests against 2.1, 3.0, DSE 4.8, DSE 5.0, DSE 5.1, dse-6.0.18 and DSE 6.7
358+
H 2 * * 1-5 %CI_SCHEDULE=WEEKNIGHTS;CI_SCHEDULE_SERVER_VERSIONS=2.1 3.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
344359
### JDK11 tests against 3.11, 4.0 and DSE 6.8
345-
H 2 * * 1-5 %CI_SCHEDULE=WEEKNIGHTS;CI_SCHEDULE_SERVER_VERSIONS=3.11 4.0 dse-6.8;CI_SCHEDULE_JABBA_VERSION=openjdk@1.11
360+
H 2 * * 1-5 %CI_SCHEDULE=WEEKNIGHTS;CI_SCHEDULE_SERVER_VERSIONS=3.11 4.0 dse-6.8.30;CI_SCHEDULE_JABBA_VERSION=openjdk@1.11
346361
# Every weekend (Sunday) around 12:00 PM noon
347362
### JDK14 tests against 3.11, 4.0 and DSE 6.8
348-
H 12 * * 0 %CI_SCHEDULE=WEEKENDS;CI_SCHEDULE_SERVER_VERSIONS=3.11 4.0 dse-6.8;CI_SCHEDULE_JABBA_VERSION=openjdk@1.14
363+
H 12 * * 0 %CI_SCHEDULE=WEEKENDS;CI_SCHEDULE_SERVER_VERSIONS=3.11 4.0 dse-6.8.30;CI_SCHEDULE_JABBA_VERSION=openjdk@1.14
349364
""" : "")
350365
}
351366

@@ -381,7 +396,7 @@ pipeline {
381396
name 'SERVER_VERSION'
382397
values '3.11', // Latest stable Apache CassandraⓇ
383398
'4.0', // Development Apache CassandraⓇ
384-
'dse-6.8' // Current DataStax Enterprise
399+
'dse-6.8.30' // Current DataStax Enterprise
385400
}
386401
}
387402

@@ -489,12 +504,12 @@ pipeline {
489504
'3.0', // Previous Apache CassandraⓇ
490505
'3.11', // Current Apache CassandraⓇ
491506
'4.0', // Development Apache CassandraⓇ
492-
'dse-4.8', // Previous EOSL DataStax Enterprise
493-
'dse-5.0', // Last EOSL DataStax Enterprise
494-
'dse-5.1', // Legacy DataStax Enterprise
495-
'dse-6.0', // Previous DataStax Enterprise
496-
'dse-6.7', // Previous DataStax Enterprise
497-
'dse-6.8' // Current DataStax Enterprise
507+
'dse-4.8.16', // Previous EOSL DataStax Enterprise
508+
'dse-5.0.15', // Last EOSL DataStax Enterprise
509+
'dse-5.1.35', // Legacy DataStax Enterprise
510+
'dse-6.0.18', // Previous DataStax Enterprise
511+
'dse-6.7.17', // Previous DataStax Enterprise
512+
'dse-6.8.30' // Current DataStax Enterprise
498513
}
499514
}
500515
when {

0 commit comments

Comments
 (0)