This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
The following commit(s) were added to refs/heads/trunk by this push:
new a1080b1 Add 4_0 to Python DTest's upgrade_manifest for cassandra-4.0.0
a1080b1 is described below
commit a1080b1ef3c77bc4c5e6a4fff154d1c17f115e22
Author: Mick Semb Wever <[email protected]>
AuthorDate: Thu Jul 1 14:04:52 2021 +0200
Add 4_0 to Python DTest's upgrade_manifest for cassandra-4.0.0
patch by Mick Semb Wever; reviewed by Berenguer Blasi, Brandon Williams
for CASSANDRA-16781
---
upgrade_tests/upgrade_manifest.py | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/upgrade_tests/upgrade_manifest.py
b/upgrade_tests/upgrade_manifest.py
index ce57c40..1326976 100644
--- a/upgrade_tests/upgrade_manifest.py
+++ b/upgrade_tests/upgrade_manifest.py
@@ -25,8 +25,8 @@ CASSANDRA_2_1 = '2.1'
CASSANDRA_2_2 = '2.2'
CASSANDRA_3_0 = '3.0'
CASSANDRA_3_11 = '3.11'
-CASSANDRA_4_0 = '4.0'
-CASSANDRA_4_0_0 = '4.0.0'
+CASSANDRA_4_0 = '4.0' # TODO remove when cassandra-4.0.0 is released (and that
branch is removed)
+CASSANDRA_4_0_X = '4.0.1' # TODO rename to CASSANDRA_4_0 when cassandra-4.0.0
is released (and that branch is removed)
CASSANDRA_4_1 = '4.1'
TRUNK = CASSANDRA_4_1
@@ -97,10 +97,12 @@ def set_version_family():
version_family = CASSANDRA_3_0
elif current_version.vstring.startswith('3.11'):
version_family = CASSANDRA_3_11
- elif current_version.vstring.startswith('4.0.0'):
- version_family = CASSANDRA_4_0_0
- elif current_version.vstring.startswith('4.0'):
+ # TODO remove when cassandra-4.0.0 is released (and that branch is removed)
+ elif current_version.vstring.startswith('4.0.0') or
current_version.vstring.startswith('4.0-'):
version_family = CASSANDRA_4_0
+ elif current_version.vstring.startswith('4.0'):
+ # TODO rename to CASSANDRA_4_0 when cassandra-4.0.0 is released (and
that branch is removed)
+ version_family = CASSANDRA_4_0_X
elif current_version.vstring.startswith('4.1'):
version_family = CASSANDRA_4_1
else:
@@ -162,8 +164,12 @@ current_3_0_x = VersionMeta(name='current_3_0_x',
family=CASSANDRA_3_0, variant=
indev_3_11_x = VersionMeta(name='indev_3_11_x', family=CASSANDRA_3_11,
variant='indev', version='github:apache/cassandra-3.11', min_proto_v=3,
max_proto_v=4, java_versions=(8,))
current_3_11_x = VersionMeta(name='current_3_11_x', family=CASSANDRA_3_11,
variant='current', version='3.11.10', min_proto_v=3, max_proto_v=4,
java_versions=(8,))
-indev_4_0_x = VersionMeta(name='indev_4_0_x', family=CASSANDRA_4_0,
variant='indev', version='github:apache/cassandra-4.0', min_proto_v=3,
max_proto_v=4, java_versions=(8,))
-current_4_0_x = VersionMeta(name='current_4_0_x', family=CASSANDRA_4_0,
variant='current', version='4.0-rc1', min_proto_v=4, max_proto_v=5,
java_versions=(8,))
+# TODO remove when cassandra-4.0.0 is released (and that branch is removed)
+indev_4_0_0 = VersionMeta(name='indev_4_0_0', family=CASSANDRA_4_0,
variant='indev', version='github:apache/cassandra-4.0.0', min_proto_v=3,
max_proto_v=4, java_versions=(8,))
+current_4_0_0 = VersionMeta(name='current_4_0_0', family=CASSANDRA_4_0,
variant='current', version='4.0-rc2', min_proto_v=4, max_proto_v=5,
java_versions=(8,))
+
+indev_4_0_x = VersionMeta(name='indev_4_0_x', family=CASSANDRA_4_0_X,
variant='indev', version='github:apache/cassandra-4.0', min_proto_v=3,
max_proto_v=4, java_versions=(8,))
+current_4_0_x = VersionMeta(name='current_4_0_x', family=CASSANDRA_4_0_X,
variant='current', version='4.0', min_proto_v=4, max_proto_v=5,
java_versions=(8,))
indev_trunk = VersionMeta(name='indev_trunk', family=TRUNK, variant='indev',
version='github:apache/trunk', min_proto_v=4, max_proto_v=5, java_versions=(8,))
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
