Jenkinsfile cleanup #1163
Jenkinsfile cleanup #1163
Conversation
| @@ -629,10 +618,10 @@ pipeline { | |||
| } | |||
|
|
|||
| triggers { | |||
| parameterizedCron((scheduleTriggerJobName() == env.JOB_NAME) ? """ | |||
| parameterizedCron(branchPatternCron().matcher(env.BRANCH_NAME).matches() ? """ | |||
There was a problem hiding this comment.
Trying to make this more consistent with the other drivers. This usage also seems to make more sense logically.
| 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'] | ||
| DEFAULT_RUNTIME = ['3.7.7', '3.8.3'] |
There was a problem hiding this comment.
Didn't seem to make much sense to include Python versions we no longer explicitly support
| "SERVER": ['2.1', '3.11', 'dse-6.8.30'], | ||
| "RUNTIME": ['2.7.18', '3.6.10'], | ||
| "CYTHON": DEFAULT_CYTHON | ||
| ], |
There was a problem hiding this comment.
This test matrix doesn't really make sense, especially after we remove these Python versions from the supported list above
| # These schedules will run with and without Cython enabled for Python v2.7.18 and v3.5.9 | ||
| H 4 * * 1-5 %CI_SCHEDULE=WEEKNIGHTS;EVENT_LOOP=LIBEV;CI_SCHEDULE_PYTHON_VERSION=2.7.18 3.5.9;CI_SCHEDULE_SERVER_VERSION=2.2 3.11 dse-5.1.35 dse-6.0.18 dse-6.7.17 | ||
| # These schedules will run with and without Cython enabled for Python 3.7.7 and 3.8.3 | ||
| H 4 * * 1-5 %CI_SCHEDULE=WEEKNIGHTS;EVENT_LOOP=LIBEV;CI_SCHEDULE_PYTHON_VERSION=3.7.7 3.8.3;CI_SCHEDULE_SERVER_VERSION=2.2 3.11 dse-5.1.35 dse-6.0.18 dse-6.7.17 |
There was a problem hiding this comment.
Part of my goal here is to get nightlies working again. PYTHON-1351 will need some environment customizations to make sure we can test the cryptography and non-cryptography cases. It probably makes sense to include one as part of the default build and the other in the nightlies.
There was a problem hiding this comment.
This probably won't be as bad as it looked initially. PYTHON-1351 is following the example of similar functionality in the Python driver (for a Gremlin dependency for DS Graph) and importing functionality specific to cryptography only if the lib is present. Since cryptography will be present in the Jenkins environment [1] those tests will be run.
[1] cryptography has now been moved to test-datastax-requirements.txt, the same spot where the Gremlin requirement lives. Requirements in that file are imported when the Jenkins environment is setup.
| "drivers/python/oss/master/disabled" | ||
| // branch pattern for cron | ||
| def branchPatternCron() { | ||
| ~"(master)" |
There was a problem hiding this comment.
you could change this to jenkinsfile_cleanup to test nightlies before merging this PR if you want to
There was a problem hiding this comment.
I'm actually okay with it. This change is identical to what the other drivers are doing so I have a high level of confidence; if for some reason it doesn't work I'm okay trying to fix it after the fact.
…sync_with_upstream_3.29.1 version 3.28.0 * tag '3.28.0' of https://github.com/datastax/python-driver: Release 3.28.0: changelog & version PYTHON-1352 Add vector type, codec + support for parsing CQL type (datastax#1161) Update docs.yaml to point to most recent 3.27.0 docs changes CONN-38 Notes for 3.27.0 on PYTHON-1350 (datastax#1166) PYTHON-1356 Create session-specific protocol handlers to contain session-specific CLE policies (datastax#1165) PYTHON-1350 Store IV along with encrypted text when using column-level encryption (datastax#1160) PYTHON-1351 Convert cryptography to an optional dependency (datastax#1164) Jenkinsfile cleanup (datastax#1163) PYTHON-1343 Use Cython for smoke builds (datastax#1162) Don't fail when inserting UDTs with prepared queries with some missing fields (datastax#1151) Revert "remove unnecessary import __future__ (datastax#1156)" docs: convert print statement to function in docs (datastax#1157) remove unnecessary import __future__ (datastax#1156) Update docs.yaml to include recent fixes to CLE docs Fix for rendering of code blocks in CLE documentation (datastax#1159) DOC-3278 Update comment for retry policy (datastax#1158) DOC-2813 (datastax#1145) Remove different build matrix selection for develop branches (datastax#1138)
Updating Jenkinsfile to reflect recent supported Python versions. Also trying to get nightlies going again against master.