This is an automated email from the ASF dual-hosted git repository.
brandonwilliams 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 efdd2223 disable jdk switching
efdd2223 is described below
commit efdd222343e76a9660716af2126ef7b348e18624
Author: Brandon Williams <[email protected]>
AuthorDate: Thu Mar 2 11:18:26 2023 -0600
disable jdk switching
Patch by brandonwilliams; reviewed by edimitrova and mck for
CASSANDRA-18106
---
upgrade_tests/upgrade_base.py | 21 ---------------------
upgrade_tests/upgrade_through_versions_test.py | 3 ---
2 files changed, 24 deletions(-)
diff --git a/upgrade_tests/upgrade_base.py b/upgrade_tests/upgrade_base.py
index dbd2fc57..30f51b25 100644
--- a/upgrade_tests/upgrade_base.py
+++ b/upgrade_tests/upgrade_base.py
@@ -17,25 +17,6 @@ from dtest import Tester, create_ks
logger = logging.getLogger(__name__)
-def switch_jdks(major_version_int):
- """
- Changes the jdk version globally, by setting JAVA_HOME = JAVA[N]_HOME.
- This means the environment must have JAVA[N]_HOME set to switch to jdk
version N.
- """
- new_java_home = 'JAVA{}_HOME'.format(major_version_int)
-
- try:
- os.environ[new_java_home]
- except KeyError:
- raise RuntimeError("You need to set {} to run these
tests!".format(new_java_home))
-
- # don't change if the same version was requested
- current_java_home = os.environ.get('JAVA_HOME')
- if current_java_home != os.environ[new_java_home]:
- logger.debug("Switching jdk to version {} (JAVA_HOME is changing from
{} to {})".format(major_version_int, current_java_home or 'undefined',
os.environ[new_java_home]))
- os.environ['JAVA_HOME'] = os.environ[new_java_home]
-
-
@pytest.mark.upgrade_test
@pytest.mark.skipif(sys.platform == 'win32', reason='Skip upgrade tests on
Windows')
class UpgradeTester(Tester, metaclass=ABCMeta):
@@ -73,7 +54,6 @@ class UpgradeTester(Tester, metaclass=ABCMeta):
previous_java_home = os.environ['JAVA_HOME']
previous_cassandra_version = os.environ['CASSANDRA_VERSION'] if
'CASSANDRA_VERSION' in os.environ else None
- switch_jdks(self.UPGRADE_PATH.starting_meta.java_version)
os.environ['CASSANDRA_VERSION'] = self.UPGRADE_PATH.starting_version
yield
@@ -170,7 +150,6 @@ class UpgradeTester(Tester, metaclass=ABCMeta):
node1.mark_log_for_errors()
logger.debug('upgrading node1 to
{}'.format(self.UPGRADE_PATH.upgrade_version))
- switch_jdks(self.UPGRADE_PATH.upgrade_meta.java_version)
node1.set_install_dir(version=self.UPGRADE_PATH.upgrade_version)
self.install_legacy_parsing(node1)
diff --git a/upgrade_tests/upgrade_through_versions_test.py
b/upgrade_tests/upgrade_through_versions_test.py
index d711a10b..022ccc2e 100644
--- a/upgrade_tests/upgrade_through_versions_test.py
+++ b/upgrade_tests/upgrade_through_versions_test.py
@@ -20,7 +20,6 @@ from cassandra.query import SimpleStatement
from dtest import RUN_STATIC_UPGRADE_MATRIX, Tester
from tools.misc import generate_ssl_stores, new_node
-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,
@@ -328,7 +327,6 @@ class TestUpgrade(Tester):
cluster = self.cluster
cluster.set_install_dir(version=self.test_version_metas[0].version)
self.install_nodetool_legacy_parsing()
- switch_jdks(self.test_version_metas[0].java_version)
self.fixture_dtest_setup.reinitialize_cluster_for_different_version()
logger.debug("Versions to test (%s): %s" % (type(self), str([v.version
for v in self.test_version_metas])))
@@ -508,7 +506,6 @@ class TestUpgrade(Tester):
and upgrade all nodes.
"""
logger.debug('Upgrading {nodes} to {version}'.format(nodes=[n.name for
n in nodes] if nodes is not None else 'all nodes',
version=version_meta.version))
- switch_jdks(version_meta.java_version)
logger.debug("JAVA_HOME: " + os.environ.get('JAVA_HOME'))
if not partial:
nodes = self.cluster.nodelist()
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
