Revert "qa/suites/upgrade/jewel-x/parallel: thrash layout"

This reverts commit 435777dbffc77c93d06476caf83be141359a5778.

This test combination is not yet stable.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/qa/suites/upgrade/jewel-x/parallel/1-jewel-install/jewel.yaml b/qa/suites/upgrade/jewel-x/parallel/1-jewel-install/jewel.yaml
index 12f8e61ec04556ed71ca105195a16e069a523a75..a7ff9f485d77136384bb2b35f8f49b9c0235522e 100644 (file)
--- a/qa/suites/upgrade/jewel-x/parallel/1-jewel-install/jewel.yaml
+++ b/qa/suites/upgrade/jewel-x/parallel/1-jewel-install/jewel.yaml
@@ -31,3 +31,10 @@ tasks:
     mon.a:
     mon.b:
 - print: "**** done install.upgrade mon.a and mon.b"
+- parallel:
+    - workload
+    - upgrade-sequence
+- print: "**** done parallel"
+- install.upgrade:
+    client.0:
+- print: "**** done install.upgrade on client.0"

diff --git a/qa/suites/upgrade/jewel-x/parallel/1.5-thrash-layout/no.yaml b/qa/suites/upgrade/jewel-x/parallel/1.5-thrash-layout/no.yaml
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/upgrade/jewel-x/parallel/1.5-thrash-layout/yes.yaml b/qa/suites/upgrade/jewel-x/parallel/1.5-thrash-layout/yes.yaml
deleted file mode 100644 (file)
index 4422187..0000000
--- a/qa/suites/upgrade/jewel-x/parallel/1.5-thrash-layout/yes.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-tasks:
-- thrashosds:
-    timeout: 1200
-    chance_down: 0
-    disable_objectstore_tool_tests: true
-    chance_thrash_pg_upmap: 0
-    chance_thrash_pg_upmap_items: 0
-    chance_thrash_cluster_full: 0
-    dump_ops_enable: false
-    sighup_delay: 0
-overrides:
-  ceph:
-    log-whitelist:
-      - overall HEALTH_
-      - \(OSDMAP_FLAGS\)
-      - \(SMALLER_PGP_NUM\)
-      - \(OBJECT_
-      - \(REQUEST_SLOW\)
-      - \(TOO_FEW_PGS\)

diff --git a/qa/suites/upgrade/jewel-x/parallel/1.7-workload-and-upgrade.yaml b/qa/suites/upgrade/jewel-x/parallel/1.7-workload-and-upgrade.yaml
deleted file mode 100644 (file)
index 2f00563..0000000
--- a/qa/suites/upgrade/jewel-x/parallel/1.7-workload-and-upgrade.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- parallel:
-    - workload
-    - upgrade-sequence
-- print: "**** done parallel"
-- install.upgrade:
-    client.0:
-- print: "**** done install.upgrade on client.0"