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 d1e2244a Add 5.0-alpha1 to upgrade_manifest.py and
upgrade_through_versions_test.py
d1e2244a is described below
commit d1e2244a7794c26d428ac93747c77db2432c24b0
Author: Mick Semb Wever <[email protected]>
AuthorDate: Sat Sep 9 12:24:52 2023 +0200
Add 5.0-alpha1 to upgrade_manifest.py and upgrade_through_versions_test.py
upgrade_through_versions_test.py should have been updated when the
cassandra-5.0 branch was created and trunk version bumped to 5.1
patch by Mick Semb Wever; reviewed by Brandon Williams, Ekaterina
Dimitrova for CASSANDRA-18832
---
upgrade_tests/upgrade_manifest.py | 6 ++----
upgrade_tests/upgrade_through_versions_test.py | 14 +++++++-------
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/upgrade_tests/upgrade_manifest.py
b/upgrade_tests/upgrade_manifest.py
index b23ac764..66386471 100644
--- a/upgrade_tests/upgrade_manifest.py
+++ b/upgrade_tests/upgrade_manifest.py
@@ -175,8 +175,7 @@ indev_4_1_x = VersionMeta(name='indev_4_1_x',
family=CASSANDRA_4_1, variant='ind
current_4_1_x = VersionMeta(name='current_4_1_x', family=CASSANDRA_4_1,
variant='current', version='4.1.3', min_proto_v=4, max_proto_v=5,
java_versions=(8,11))
indev_5_0_x = VersionMeta(name='indev_5_0_x', family=CASSANDRA_5_0,
variant='indev', version='github:apache/cassandra-5.0', min_proto_v=4,
max_proto_v=5, java_versions=(11,17))
-# uncomment when 5.0-alpha1 is released
-#current_5_0_x = VersionMeta(name='current_5_0_x', family=CASSANDRA_5_0,
variant='current', version='5.0-alpha1', min_proto_v=4, max_proto_v=5,
java_versions=(11,17))
+current_5_0_x = VersionMeta(name='current_5_0_x', family=CASSANDRA_5_0,
variant='current', version='5.0-alpha1', min_proto_v=4, max_proto_v=5,
java_versions=(11,17))
indev_trunk = VersionMeta(name='indev_trunk', family=TRUNK, variant='indev',
version='github:apache/trunk', min_proto_v=4, max_proto_v=5,
java_versions=(11,17))
# current_5_1_x = VersionMeta(name='current_5_1_x', family=CASSANDRA_5_1,
variant='current', version='5.1-alpha1', min_proto_v=4, max_proto_v=5,
java_versions=(11,17))
@@ -197,8 +196,7 @@ MANIFEST = {
current_3_11_x: [indev_3_11_x, indev_4_0_x, indev_4_1_x],
current_4_0_x: [indev_4_0_x, indev_4_1_x, indev_5_0_x, indev_trunk],
current_4_1_x: [indev_4_1_x, indev_5_0_x, indev_trunk],
- # uncomment when 5.0-alpha1 is released
- #current_5_0_x: [indev_5_0_x, indev_trunk],
+ current_5_0_x: [indev_5_0_x, indev_trunk],
indev_2_1_x: [indev_2_2_x, indev_3_0_x, indev_3_11_x],
indev_2_2_x: [indev_3_0_x, indev_3_11_x],
diff --git a/upgrade_tests/upgrade_through_versions_test.py
b/upgrade_tests/upgrade_through_versions_test.py
index ad218450..9fc35fc0 100644
--- a/upgrade_tests/upgrade_through_versions_test.py
+++ b/upgrade_tests/upgrade_through_versions_test.py
@@ -22,7 +22,7 @@ from dtest import Tester
from tools.misc import generate_ssl_stores, new_node
from .upgrade_manifest import (build_upgrade_pairs, jdk_compatible_steps,
current_2_2_x,
current_3_0_x, current_3_11_x,
- current_4_0_x, current_4_1_x,
+ current_4_0_x, current_4_1_x, current_5_0_x,
indev_trunk,
CASSANDRA_4_0, CASSANDRA_5_0,
RUN_STATIC_UPGRADE_MATRIX, CURRENT_JAVA_VERSION)
@@ -900,27 +900,27 @@ MultiUpgrade = namedtuple('MultiUpgrade', ('name',
'version_metas', 'protocol_ve
MULTI_UPGRADES = (
# Proto v3 upgrades (v3 is supported on 2.1, 2.2, 3.0, 3.11, 4.0, 4.1,
trunk)
MultiUpgrade(name='TestProtoV3Upgrade_AllVersions_EndsAt_Trunk_HEAD',
- version_metas=[current_2_2_x, current_3_0_x, current_3_11_x,
current_4_0_x, current_4_1_x, indev_trunk], protocol_version=3,
extra_config=None),
+ version_metas=[current_2_2_x, current_3_0_x, current_3_11_x,
current_4_0_x, current_4_1_x, current_5_0_x, indev_trunk], protocol_version=3,
extra_config=None),
MultiUpgrade(name='TestProtoV3Upgrade_AllVersions_RandomPartitioner_EndsAt_Trunk_HEAD',
- version_metas=[current_2_2_x, current_3_0_x, current_3_11_x,
current_4_0_x, current_4_1_x, indev_trunk], protocol_version=3,
+ version_metas=[current_2_2_x, current_3_0_x, current_3_11_x,
current_4_0_x, current_4_1_x, current_5_0_x, indev_trunk], protocol_version=3,
extra_config=(
('partitioner',
'org.apache.cassandra.dht.RandomPartitioner'),
)),
# Proto v4 upgrades (v4 is supported on 2.2, 3.0, 3.1, 4.0, 4.1, trunk)
MultiUpgrade(name='TestProtoV4Upgrade_AllVersions_EndsAt_Trunk_HEAD',
- version_metas=[current_2_2_x, current_3_0_x, current_3_11_x,
current_4_0_x, current_4_1_x, indev_trunk], protocol_version=4,
extra_config=None),
+ version_metas=[current_2_2_x, current_3_0_x, current_3_11_x,
current_4_0_x, current_4_1_x, current_5_0_x, indev_trunk], protocol_version=4,
extra_config=None),
MultiUpgrade(name='TestProtoV4Upgrade_AllVersions_RandomPartitioner_EndsAt_Trunk_HEAD',
- version_metas=[current_2_2_x, current_3_0_x, current_3_11_x,
current_4_0_x, current_4_1_x, indev_trunk], protocol_version=4,
+ version_metas=[current_2_2_x, current_3_0_x, current_3_11_x,
current_4_0_x, current_4_1_x, current_5_0_x, indev_trunk], protocol_version=4,
extra_config=(
('partitioner',
'org.apache.cassandra.dht.RandomPartitioner'),
)),
# Proto v5 upgrades (v5 is supported on 4.1, trunk)
MultiUpgrade(name='TestProtoV5Upgrade_AllVersions_EndsAt_Trunk_HEAD',
- version_metas=[current_4_1_x, indev_trunk],
protocol_version=5, extra_config=None),
+ version_metas=[current_4_1_x, current_5_0_x, indev_trunk],
protocol_version=5, extra_config=None),
MultiUpgrade(name='TestProtoV5Upgrade_AllVersions_RandomPartitioner_EndsAt_Trunk_HEAD',
- version_metas=[current_4_1_x, indev_trunk],
protocol_version=5,
+ version_metas=[current_4_1_x, current_5_0_x, indev_trunk],
protocol_version=5,
extra_config=(
('partitioner',
'org.apache.cassandra.dht.RandomPartitioner'),
)),
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
