Skip to content

Remove different build matrix selection for develop branches#1138

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
absurdfarce merged 4 commits into from
May 9, 2023
Merged

Remove different build matrix selection for develop branches #1138

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
395af1e
Remove different build matrix selection for develop branches; we'd li…
Mar 7, 2023
4a3118c
Avoid setting profile value based on the name of a feature branch
Mar 9, 2023
3e572da
A few small Jenkinsfile cleanups
Mar 9, 2023
024d57c
Merge branch 'master' into one_matrix_to_rule_them_all
May 9, 2023
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
68 changes: 25 additions & 43 deletions Jenkinsfile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,31 +33,35 @@ slack = new Slack()
//
// Smoke tests are CI-friendly test configuration. Currently-supported Python version + modern C*/DSE instances.
// We also avoid cython since it's tested as part of the nightlies.
DEFAULT_CASSANDRA = ['2.1', '2.2', '3.0', '3.11', '4.0']
DEFAULT_DSE = ['dse-5.0.15', 'dse-5.1.35', 'dse-6.0.18', 'dse-6.7.17', 'dse-6.8.30']
DEFAULT_RUNTIME = ['2.7.18', '3.5.9', '3.6.10', '3.7.7', '3.8.3']

@absurdfarceabsurdfarceMar 22, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a little strange to keep 2.7.x + 3.5.x + 3.6.x around here. My rationale is that this PR is really about removing the special handling of "develop" branches + some normalization for how versions are specified. Actual changes in versions we test against will be done in a PR explicitly focused on that role (and should be accompanied by corresponding changes to the runners).

@joao-r-reisjoao-r-reisMay 3, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a great way to keep these versions in a single place, TIL!

DEFAULT_CYTHON = ["True", "False"]
matrices = [
"FULL": [
"SERVER": ['2.1', '2.2', '3.0', '3.11', '4.0', 'dse-5.0.15', 'dse-5.1.35', 'dse-6.0.18', 'dse-6.7.17', 'dse-6.8.30'],
"RUNTIME": ['2.7.18', '3.5.9', '3.6.10', '3.7.7', '3.8.3'],
"CYTHON": ["True", "False"]
"SERVER": DEFAULT_CASSANDRA + DEFAULT_DSE,
"RUNTIME": DEFAULT_RUNTIME,
"CYTHON": DEFAULT_CYTHON
],
"DEVELOP": [
"SERVER": ['2.1', '3.11', 'dse-6.8.30'],
"RUNTIME": ['2.7.18', '3.6.10'],
"CYTHON": ["True", "False"]
"CYTHON": DEFAULT_CYTHON
],
"CASSANDRA": [
"SERVER": ['2.1', '2.2', '3.0', '3.11', '4.0'],
"RUNTIME": ['2.7.18', '3.5.9', '3.6.10', '3.7.7', '3.8.3'],
"CYTHON": ["True", "False"]
"SERVER": DEFAULT_CASSANDRA,
"RUNTIME": DEFAULT_RUNTIME,
"CYTHON": DEFAULT_CYTHON
],
"DSE": [
"SERVER": ['dse-5.0.15', 'dse-5.1.35', 'dse-6.0.18', 'dse-6.7.17', 'dse-6.8.30'],
"RUNTIME": ['2.7.18', '3.5.9', '3.6.10', '3.7.7', '3.8.3'],
"CYTHON": ["True", "False"]
"SERVER": DEFAULT_DSE,
"RUNTIME": DEFAULT_RUNTIME,
"CYTHON": DEFAULT_CYTHON
],
"SMOKE": [
"SERVER": ['3.11', '4.0', 'dse-6.8.30'],
"RUNTIME": ['3.7.7', '3.8.3'],
"CYTHON": ["True", "False"]
"SERVER": DEFAULT_CASSANDRA.takeRight(2) + DEFAULT_DSE.takeRight(1),
"RUNTIME": DEFAULT_RUNTIME.takeRight(2),
"CYTHON": ["False"]

@absurdfarceabsurdfarceMar 9, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just reducing some redundancy while we're here + making things a bit more declarative

]
]

Expand All@@ -84,24 +88,13 @@ def getBuildContext() {
Based on schedule and parameters, configure the build context and env vars.
*/

def profile = "${params.PROFILE}"
def PROFILE = "${params.PROFILE}"
def EVENT_LOOP = "${params.EVENT_LOOP.toLowerCase()}"
matrixType = "SMOKE"
developBranchPattern = ~"((dev|long)-)?python-.*"

if (developBranchPattern.matcher(env.BRANCH_NAME).matches()) {
matrixType = "DEVELOP"
if (env.BRANCH_NAME.contains("long")) {
profile = "FULL"
}
}
matrixType = params.MATRIX != "DEFAULT" ? params.MATRIX : "SMOKE"
matrix = matrices[matrixType].clone()

// Check if parameters were set explicitly
if (params.MATRIX != "DEFAULT") {
matrixType = params.MATRIX
}

matrix = matrices[matrixType].clone()
if (params.CYTHON != "DEFAULT") {
matrix["CYTHON"] = [params.CYTHON]
}
Expand All@@ -121,7 +114,7 @@ def getBuildContext() {

context = [
vars: [
"PROFILE=${profile}",
"PROFILE=${PROFILE}",
"EVENT_LOOP=${EVENT_LOOP}"
],
matrix: matrix
Expand DownExpand Up@@ -503,22 +496,11 @@ pipeline {
</table>''')
choice(
name: 'PYTHON_VERSION',
choices: ['DEFAULT', '2.7.18', '3.5.9', '3.6.10', '3.7.7', '3.8.3'],
choices: ['DEFAULT'] + DEFAULT_RUNTIME,
description: 'Python runtime version. Default to the build context.')
choice(
name: 'SERVER_VERSION',
choices: ['DEFAULT',
'2.1', // Legacy Apache CassandraⓇ
'2.2', // Legacy Apache CassandraⓇ
'3.0', // Previous Apache CassandraⓇ
'3.11', // Current Apache CassandraⓇ
'4.0', // Development Apache CassandraⓇ
'dse-5.0.15', // Long Term Support DataStax Enterprise
'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
],
choices: ['DEFAULT'] + DEFAULT_CASSANDRA + DEFAULT_DSE,
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%">
<col width="15%">
Expand DownExpand Up@@ -549,7 +531,7 @@ pipeline {
</tr>
<tr>
<td><strong>4.0</strong></td>
<td>Apache CassandraⓇ v4.x (<b>CURRENTLY UNDER DEVELOPMENT</b>)</td>
<td>Apache CassandraⓇ v4.0.x</td>
</tr>
<tr>
<td><strong>dse-5.0.15</strong></td>
Expand All@@ -574,7 +556,7 @@ pipeline {
</table>''')
choice(
name: 'CYTHON',
choices: ['DEFAULT', 'True', 'False'],
choices: ['DEFAULT'] + DEFAULT_CYTHON,
description: '''<p>Flag to determine if Cython should be enabled</p>
<table style="width:100%">
<col width="25%">
Expand Down