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 3801a9b0 Update trunk to version 4.2 3801a9b0 is described below commit 3801a9b00884279a3e8c095b1cf6fb920ac76fa8 Author: Mick Semb Wever <m...@apache.org> AuthorDate: Mon May 2 20:54:50 2022 +0200 Update trunk to version 4.2 patch by Mick Semb Wever; reviewed by Ekaterina Dimitrova for CASSANDRA-17589 --- upgrade_tests/upgrade_manifest.py | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/upgrade_tests/upgrade_manifest.py b/upgrade_tests/upgrade_manifest.py index 29382f09..02361ef8 100644 --- a/upgrade_tests/upgrade_manifest.py +++ b/upgrade_tests/upgrade_manifest.py @@ -27,7 +27,8 @@ CASSANDRA_3_0 = '3.0' CASSANDRA_3_11 = '3.11' CASSANDRA_4_0 = '4.0' CASSANDRA_4_1 = '4.1' -TRUNK = CASSANDRA_4_1 +CASSANDRA_4_2 = '4.2' +TRUNK = CASSANDRA_4_2 def is_same_family_current_to_indev(origin, destination): """ @@ -100,6 +101,8 @@ def set_version_family(): version_family = CASSANDRA_4_0 elif current_version.vstring.startswith('4.1'): version_family = CASSANDRA_4_1 + elif current_version.vstring.startswith('4.2'): + version_family = CASSANDRA_4_2 else: # when this occurs, it's time to update this manifest a bit! raise RuntimeError("Testing upgrades from/to version %s is not supported. Please use a custom manifest (see upgrade_manifest.py)" % current_version.vstring) @@ -154,14 +157,17 @@ indev_2_2_x = VersionMeta(name='indev_2_2_x', family=CASSANDRA_2_2, variant='ind current_2_2_x = VersionMeta(name='current_2_2_x', family=CASSANDRA_2_2, variant='current', version='2.2.19', min_proto_v=1, max_proto_v=3, java_versions=(7, 8)) indev_3_0_x = VersionMeta(name='indev_3_0_x', family=CASSANDRA_3_0, variant='indev', version='github:apache/cassandra-3.0', min_proto_v=3, max_proto_v=4, java_versions=(8,)) -current_3_0_x = VersionMeta(name='current_3_0_x', family=CASSANDRA_3_0, variant='current', version='3.0.24', min_proto_v=3, max_proto_v=4, java_versions=(8,)) +current_3_0_x = VersionMeta(name='current_3_0_x', family=CASSANDRA_3_0, variant='current', version='3.0.26', min_proto_v=3, max_proto_v=4, java_versions=(8,)) 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,)) +current_3_11_x = VersionMeta(name='current_3_11_x', family=CASSANDRA_3_11, variant='current', version='3.11.12', 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.3', min_proto_v=4, max_proto_v=5, java_versions=(8,)) +indev_4_1_x = VersionMeta(name='indev_4_1_x', family=CASSANDRA_4_1, variant='indev', version='github:apache/cassandra-4.1', min_proto_v=3, max_proto_v=4, java_versions=(8,)) +#current_4_1_x = VersionMeta(name='current_4_1_x', family=CASSANDRA_4_1, variant='current', version='4.1-alpha1', 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,)) @@ -176,14 +182,14 @@ indev_trunk = VersionMeta(name='indev_trunk', family=TRUNK, variant='indev', ver MANIFEST = { current_2_1_x: [indev_2_2_x, indev_3_0_x, indev_3_11_x], current_2_2_x: [indev_2_2_x, indev_3_0_x, indev_3_11_x], - current_3_0_x: [indev_3_0_x, indev_3_11_x, indev_4_0_x, indev_trunk], - current_3_11_x: [indev_3_11_x, indev_4_0_x, indev_trunk], - current_4_0_x: [indev_4_0_x, indev_trunk], + current_3_0_x: [indev_3_0_x, indev_3_11_x, indev_4_0_x, indev_4_1_x, indev_trunk], + current_3_11_x: [indev_3_11_x, indev_4_0_x, indev_4_1_x, indev_trunk], + current_4_0_x: [indev_4_0_x, indev_4_1_x, indev_trunk], indev_2_2_x: [indev_3_0_x, indev_3_11_x], - indev_3_0_x: [indev_3_11_x, indev_4_0_x, indev_trunk], - indev_3_11_x: [indev_4_0_x, indev_trunk], - indev_4_0_x: [indev_trunk] + indev_3_0_x: [indev_3_11_x, indev_4_0_x, indev_4_1_x, indev_trunk], + indev_3_11_x: [indev_4_0_x, indev_4_1_x, indev_trunk], + indev_4_0_x: [indev_4_1_x, indev_trunk] } def _have_common_proto(origin_meta, destination_meta): --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org