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 79602451 Change trunk from 4.2 to 5.0
79602451 is described below
commit 79602451c9efb05fd16f09249823ebe8049e01e2
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Sat Feb 25 11:29:37 2023 +0100
Change trunk from 4.2 to 5.0
Use parent sha to run against 4.2-SNAPSHOT versions of trunk.
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-17973
---
upgrade_tests/upgrade_manifest.py | 16 ++++++++--------
upgrade_tests/upgrade_through_versions_test.py | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/upgrade_tests/upgrade_manifest.py
b/upgrade_tests/upgrade_manifest.py
index b369121e..bd345d9f 100644
--- a/upgrade_tests/upgrade_manifest.py
+++ b/upgrade_tests/upgrade_manifest.py
@@ -27,8 +27,8 @@ CASSANDRA_3_0 = '3.0'
CASSANDRA_3_11 = '3.11'
CASSANDRA_4_0 = '4.0'
CASSANDRA_4_1 = '4.1'
-CASSANDRA_4_2 = '4.2'
-TRUNK = CASSANDRA_4_2
+CASSANDRA_5_0 = '5.0'
+TRUNK = CASSANDRA_5_0
def is_same_family_current_to_indev(origin, destination):
"""
@@ -101,8 +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
+ elif current_version.vstring.startswith('5.0'):
+ version_family = CASSANDRA_5_0
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)
@@ -182,13 +182,13 @@ 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_4_1_x,
indev_trunk],
- current_3_11_x: [indev_3_11_x, indev_4_0_x, indev_4_1_x, indev_trunk],
+ current_3_0_x: [indev_3_0_x, indev_3_11_x, indev_4_0_x, indev_4_1_x],
+ 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_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_4_1_x, indev_trunk],
- indev_3_11_x: [indev_4_0_x, indev_4_1_x, indev_trunk],
+ indev_3_0_x: [indev_3_11_x, indev_4_0_x, indev_4_1_x],
+ indev_3_11_x: [indev_4_0_x, indev_4_1_x],
indev_4_0_x: [indev_4_1_x, indev_trunk],
indev_4_1_x: [indev_trunk]
}
diff --git a/upgrade_tests/upgrade_through_versions_test.py
b/upgrade_tests/upgrade_through_versions_test.py
index 58fc02e3..d711a10b 100644
--- a/upgrade_tests/upgrade_through_versions_test.py
+++ b/upgrade_tests/upgrade_through_versions_test.py
@@ -24,7 +24,7 @@ from .upgrade_base import switch_jdks
from .upgrade_manifest import (build_upgrade_pairs,
current_2_1_x, current_2_2_x, current_3_0_x,
indev_3_11_x,
- current_3_11_x, indev_trunk, CASSANDRA_4_0,
CASSANDRA_4_2)
+ current_3_11_x, indev_trunk, CASSANDRA_4_0,
CASSANDRA_5_0)
logger = logging.getLogger(__name__)
@@ -526,7 +526,7 @@ class TestUpgrade(Tester):
logger.debug("Set new cassandra dir for %s: %s" % (node.name,
node.get_install_dir()))
if internode_ssl and (LooseVersion(version_meta.family) >=
CASSANDRA_4_0):
node.set_configuration_options({'server_encryption_options':
{'enabled': True, 'enable_legacy_ssl_storage_port': True}})
- if LooseVersion(version_meta.family) >= CASSANDRA_4_2:
+ if LooseVersion(version_meta.family) >= CASSANDRA_5_0:
node.set_configuration_options({'enable_scripted_user_defined_functions':
'false'})
# hacky? yes. We could probably extend ccm to allow this publicly.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
