From 6d3b7c97b842fe03ea2f74ce021fea5b96323826 Mon Sep 17 00:00:00 2001
From: Trevor Clinkenbeard <trevor.clinkenbeard@snowflake.com>
Date: Fri, 11 Feb 2022 14:37:14 -0800
Subject: [PATCH] Revert "add proper downgrade/upgrade test for storage
 migration with PPW"

---
 tests/CMakeLists.txt                          |  8 ------
 ...onfigureStorageMigrationTestRestart-1.toml | 25 -------------------
 ...onfigureStorageMigrationTestRestart-2.toml | 19 --------------
 ...onfigureStorageMigrationTestRestart-1.toml | 25 -------------------
 ...onfigureStorageMigrationTestRestart-2.toml | 19 --------------
 5 files changed, 96 deletions(-)
 delete mode 100644 tests/restarting/from_7.0.0/ConfigureStorageMigrationTestRestart-1.toml
 delete mode 100644 tests/restarting/from_7.0.0/ConfigureStorageMigrationTestRestart-2.toml
 delete mode 100644 tests/restarting/to_7.0.0/ConfigureStorageMigrationTestRestart-1.toml
 delete mode 100644 tests/restarting/to_7.0.0/ConfigureStorageMigrationTestRestart-2.toml

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 6c52b440fa..df6cf64466 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -243,9 +243,6 @@ if(WITH_PYTHON)
   add_fdb_test(
     TEST_FILES restarting/to_7.0.0/CycleTestRestart-1.txt
                restarting/to_7.0.0/CycleTestRestart-2.txt)
-  add_fdb_test(
-    TEST_FILES restarting/to_7.0.0/ConfigureStorageMigrationTestRestart-1.toml
-               restarting/to_7.0.0/ConfigureStorageMigrationTestRestart-2.toml)
   add_fdb_test(
     TEST_FILES restarting/from_7.0.0/SnapTestAttrition-1.txt
                restarting/from_7.0.0/SnapTestAttrition-2.txt)
@@ -258,11 +255,6 @@ if(WITH_PYTHON)
   add_fdb_test(
     TEST_FILES restarting/from_7.0.0/SnapCycleRestart-1.txt
                restarting/from_7.0.0/SnapCycleRestart-2.txt)
-  add_fdb_test(
-    TEST_FILES restarting/from_7.0.0/ConfigureStorageMigrationTestRestart-1.toml
-               restarting/from_7.0.0/ConfigureStorageMigrationTestRestart-2.toml)
-
-
   add_fdb_test(TEST_FILES slow/ApiCorrectness.toml)
   add_fdb_test(TEST_FILES slow/ApiCorrectnessAtomicRestore.toml)
   add_fdb_test(TEST_FILES slow/ApiCorrectnessSwitchover.toml)
diff --git a/tests/restarting/from_7.0.0/ConfigureStorageMigrationTestRestart-1.toml b/tests/restarting/from_7.0.0/ConfigureStorageMigrationTestRestart-1.toml
deleted file mode 100644
index a70a9e70bf..0000000000
--- a/tests/restarting/from_7.0.0/ConfigureStorageMigrationTestRestart-1.toml
+++ /dev/null
@@ -1,25 +0,0 @@
-extraMachineCountDC = 2
-
-[[test]]
-testTitle = 'CloggedConfigureDatabaseTest'
-clearAfterTest = false
-
-    [[test.workload]]
-    testName = 'ConfigureDatabase'
-    testDuration = 30.0
-    allowTestStorageMigration = true
-
-    [[test.workload]]
-    testName = 'RandomClogging'
-    testDuration = 30.0
-
-    [[test.workload]]
-    testName = 'RandomClogging'
-    testDuration = 30.0
-    scale = 0.1
-    clogginess = 2.0
-
-    [[test.workload]]
-    testName='SaveAndKill'
-    restartInfoLocation='simfdb/restartInfo.ini'
-    testDuration=30.0
\ No newline at end of file
diff --git a/tests/restarting/from_7.0.0/ConfigureStorageMigrationTestRestart-2.toml b/tests/restarting/from_7.0.0/ConfigureStorageMigrationTestRestart-2.toml
deleted file mode 100644
index f8361ab8c7..0000000000
--- a/tests/restarting/from_7.0.0/ConfigureStorageMigrationTestRestart-2.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-extraMachineCountDC = 2
-
-[[test]]
-testTitle = 'CloggedConfigureDatabaseTest'
-runSetup=false
-
-    [[test.workload]]
-    testName = 'ConfigureDatabase'
-    testDuration = 300.0
-
-    [[test.workload]]
-    testName = 'RandomClogging'
-    testDuration = 300.0
-
-    [[test.workload]]
-    testName = 'RandomClogging'
-    testDuration = 300.0
-    scale = 0.1
-    clogginess = 2.0
\ No newline at end of file
diff --git a/tests/restarting/to_7.0.0/ConfigureStorageMigrationTestRestart-1.toml b/tests/restarting/to_7.0.0/ConfigureStorageMigrationTestRestart-1.toml
deleted file mode 100644
index a70a9e70bf..0000000000
--- a/tests/restarting/to_7.0.0/ConfigureStorageMigrationTestRestart-1.toml
+++ /dev/null
@@ -1,25 +0,0 @@
-extraMachineCountDC = 2
-
-[[test]]
-testTitle = 'CloggedConfigureDatabaseTest'
-clearAfterTest = false
-
-    [[test.workload]]
-    testName = 'ConfigureDatabase'
-    testDuration = 30.0
-    allowTestStorageMigration = true
-
-    [[test.workload]]
-    testName = 'RandomClogging'
-    testDuration = 30.0
-
-    [[test.workload]]
-    testName = 'RandomClogging'
-    testDuration = 30.0
-    scale = 0.1
-    clogginess = 2.0
-
-    [[test.workload]]
-    testName='SaveAndKill'
-    restartInfoLocation='simfdb/restartInfo.ini'
-    testDuration=30.0
\ No newline at end of file
diff --git a/tests/restarting/to_7.0.0/ConfigureStorageMigrationTestRestart-2.toml b/tests/restarting/to_7.0.0/ConfigureStorageMigrationTestRestart-2.toml
deleted file mode 100644
index f8361ab8c7..0000000000
--- a/tests/restarting/to_7.0.0/ConfigureStorageMigrationTestRestart-2.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-extraMachineCountDC = 2
-
-[[test]]
-testTitle = 'CloggedConfigureDatabaseTest'
-runSetup=false
-
-    [[test.workload]]
-    testName = 'ConfigureDatabase'
-    testDuration = 300.0
-
-    [[test.workload]]
-    testName = 'RandomClogging'
-    testDuration = 300.0
-
-    [[test.workload]]
-    testName = 'RandomClogging'
-    testDuration = 300.0
-    scale = 0.1
-    clogginess = 2.0
\ No newline at end of file