From 4624bc56c88ef62cdf40b66ff4fe3742828d4ded Mon Sep 17 00:00:00 2001 From: Lingxian Kong Date: Mon, 17 Aug 2020 09:15:46 +1200 Subject: [PATCH] Disable upgrade test if not configured Change-Id: Idf171390675f54d313306f6ad19e21f51c9c685f --- trove_tempest_plugin/config.py | 2 +- trove_tempest_plugin/tests/scenario/base_actions.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/trove_tempest_plugin/config.py b/trove_tempest_plugin/config.py index 6becc11..ed6b798 100644 --- a/trove_tempest_plugin/config.py +++ b/trove_tempest_plugin/config.py @@ -91,7 +91,7 @@ DatabaseGroup = [ ), cfg.DictOpt( 'pre_upgrade_datastore_versions', - default={'mysql': '5.7.29'}, + default={}, help='The datastore versions used to create instances that need to be ' 'upgrade.', ), diff --git a/trove_tempest_plugin/tests/scenario/base_actions.py b/trove_tempest_plugin/tests/scenario/base_actions.py index 533398e..1f9c433 100644 --- a/trove_tempest_plugin/tests/scenario/base_actions.py +++ b/trove_tempest_plugin/tests/scenario/base_actions.py @@ -61,6 +61,8 @@ class TestInstanceActionsBase(trove_base.BaseTroveTest): constants.DB_NAME) @decorators.idempotent_id("be6dd514-27d6-11ea-a56a-98f2b3cc23a0") + @testtools.skipUnless(CONF.database.pre_upgrade_datastore_versions, + 'Datastore upgrade is disabled.') def test_instance_upgrade(self): cur_version = self.instance['datastore']['version'] cfg_versions = CONF.database.pre_upgrade_datastore_versions