Update SUPPORTED_UPGRADE_PATHS to include 3.0 and 3.x to 4.1 paths an…

…d remove obsolete tests

patch by Caleb Rackliffe; reviewed by Mick Semb Wever for CASSANDRA-17362

upgrade_tests/upgrade_manifest.py

@@ -25,8 +25,7 @@
 CASSANDRA_2_2 = '2.2'
 CASSANDRA_3_0 = '3.0'
 CASSANDRA_3_11 = '3.11'
-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_0 = '4.0'
 CASSANDRA_4_1 = '4.1'
 TRUNK = CASSANDRA_4_1
 
@@ -97,12 +96,8 @@ def set_version_family():
         version_family = CASSANDRA_3_0
     elif current_version.vstring.startswith('3.11'):
         version_family = CASSANDRA_3_11
-    # 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
+        version_family = CASSANDRA_4_0
     elif current_version.vstring.startswith('4.1'):
         version_family = CASSANDRA_4_1
     else:
@@ -164,12 +159,8 @@ def clone_with_local_env_version(self):
 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,))
 
-# 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_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_trunk = VersionMeta(name='indev_trunk', family=TRUNK, variant='indev', version='github:apache/trunk', min_proto_v=4, max_proto_v=5, java_versions=(8,))
 
@@ -185,13 +176,13 @@ def clone_with_local_env_version(self):
 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],
-    current_3_11_x: [indev_3_11_x, indev_4_0_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],
 
     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_3_11_x: [indev_4_0_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]
 }