fix(upgrde_test): remove unneeded configuration options

those option are no supported anymore, and shouldn't be available
anymore.

defaults/test_default.yaml

@@ -134,10 +134,7 @@ cassandra_stress_threads: 1000
 new_scylla_repo: ''
 new_version: ''
 upgrade_node_packages: ''
-test_sst3: false
-recover_system_tables: false
 scylla_version: ''
-test_upgrade_from_installed_3_1_0: false
 target_upgrade_version: ''
 disable_raft: true
 enable_tablets_on_upgrade: false

docs/configuration_options.md

@@ -2652,33 +2652,6 @@ Upgrade system packages on nodes before upgrading Scylla. Enabled by default
 **type:** boolean
 
 
-## **test_sst3** / SCT_TEST_SST3
-
-
-
-**default:** N/A
-
-**type:** boolean
-
-
-## **test_upgrade_from_installed_3_1_0** / SCT_TEST_UPGRADE_FROM_INSTALLED_3_1_0
-
-Enable an option for installed 3.1.0 for work around a scylla issue if it's true
-
-**default:** N/A
-
-**type:** boolean
-
-
-## **recover_system_tables** / SCT_RECOVER_SYSTEM_TABLES
-
-
-
-**default:** N/A
-
-**type:** boolean
-
-
 ## **stress_cmd_1** / SCT_STRESS_CMD_1
 
 cassandra-stress commands.<br>You can specify everything but the -node parameter, which is going to<br>be provided by the test suite infrastructure.<br>multiple commands can passed as a list

sdcm/sct_config.py

@@ -1322,15 +1322,6 @@ class SCTConfiguration(dict):
         dict(name="upgrade_node_system", env="SCT_UPGRADE_NODE_SYSTEM", type=boolean,
              help="Upgrade system packages on nodes before upgrading Scylla. Enabled by default"),
 
-        dict(name="test_sst3", env="SCT_TEST_SST3", type=boolean,
-             help=""),
-
-        dict(name="test_upgrade_from_installed_3_1_0", env="SCT_TEST_UPGRADE_FROM_INSTALLED_3_1_0", type=boolean,
-             help="Enable an option for installed 3.1.0 for work around a scylla issue if it's true"),
-
-        dict(name="recover_system_tables", env="SCT_RECOVER_SYSTEM_TABLES", type=boolean,
-             help=""),
-
         dict(name="stress_cmd_1", env="SCT_STRESS_CMD_1", type=str_or_list,
              help="""cassandra-stress commands.
                 You can specify everything but the -node parameter, which is going to

test-cases/upgrades/customer-profile/rolling-upgrade-custom-d1.yaml

@@ -34,8 +34,6 @@ authenticator: 'PasswordAuthenticator'
 authenticator_user: 'cassandra'
 authenticator_password: 'cassandra'
 
-recover_system_tables: true
-
 append_scylla_args: '--blocked-reactor-notify-ms 500 --abort-on-lsa-bad-alloc 1 --abort-on-seastar-bad-alloc --abort-on-internal-error 1'
 
 use_mgmt: false

upgrade_test.py

@@ -41,7 +41,6 @@
 from sdcm.utils.user_profile import get_profile_content
 from sdcm.utils.version_utils import (
     get_node_supported_sstable_versions,
-    is_enterprise,
     get_node_enabled_sstable_version
 )
 from sdcm.sct_events.system import InfoEvent
@@ -222,9 +221,6 @@ def _upgrade_node(self, node, upgrade_sstables=True, new_scylla_repo=None, new_v
         if self.params.get("enable_tablets_on_upgrade"):
             scylla_yaml_updates.update({"enable_tablets": True})
 
-        if self.params.get('test_sst3'):
-            scylla_yaml_updates.update({"enable_sstables_mc_format": True})
-
         InfoEvent(message='Upgrading a Node').publish()
         # We assume that if update_db_packages is not empty we install packages from there.
         # In this case we don't use upgrade based on new_scylla_repo(ignored sudo yum update scylla...)
@@ -432,25 +428,7 @@ def _rollback_node(self, node, upgrade_sstables=True):
         new_ver = result.stdout.strip()
 
         node.remoter.run('sudo cp /etc/scylla/scylla.yaml-backup /etc/scylla/scylla.yaml')
-        result = node.remoter.run('sudo find /var/lib/scylla/data/system')
-        snapshot_name = re.findall(r"system/peers-[a-z0-9]+/snapshots/(\d+)\n", result.stdout)
-        # cmd = (
-        #     r"DIR='/var/lib/scylla/data/system'; "
-        #     r"for i in `sudo ls $DIR`; do "
-        #     r"    sudo test -e $DIR/$i/snapshots/%s && sudo find $DIR/$i/snapshots/%s -type f -exec sudo /bin/cp {} $DIR/$i/ \;; "
-        #     r"done" % (snapshot_name[0], snapshot_name[0]))
-
-        # recover the system tables - if it's downgrade from enterprise to OSS
-        if (self.params.get('recover_system_tables') or
-                (is_enterprise(orig_ver) and not is_enterprise(new_ver))):
-            node.remoter.send_files('./data_dir/recover_system_tables.sh', '/tmp/')
-            node.remoter.run('bash /tmp/recover_system_tables.sh %s' % snapshot_name[0], verbose=True)
-        if self.params.get('test_sst3'):
-            node.remoter.run(
-                r'sudo sed -i -e "s/enable_sstables_mc_format:/#enable_sstables_mc_format:/g" /etc/scylla/scylla.yaml')
-        if self.params.get('test_upgrade_from_installed_3_1_0'):
-            node.remoter.run(
-                r'sudo sed -i -e "s/enable_3_1_0_compatibility_mode:/#enable_3_1_0_compatibility_mode:/g" /etc/scylla/scylla.yaml')
+
         node.drop_raft_property()
         # Current default 300s aren't enough for upgrade test of Debian 9.
         # Related issue: https://github.com/scylladb/scylla-cluster-tests/issues/1726