From: Sage Weil <sage@redhat.com>
Date: Thu, 27 Apr 2017 14:07:44 +0000 (-0400)
Subject: qa/suites/upgrade/kraken-x/stress-split: updates
X-Git-Tag: v12.0.3~157^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dd174148ef067a9ae3c2b4603b5f4c06ebf3a035;p=ceph.git

qa/suites/upgrade/kraken-x/stress-split: updates

Bring this in line with jewel-x (which now passes).

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

diff --git a/qa/releases/luminous-with-mgr.yaml b/qa/releases/luminous-with-mgr.yaml
new file mode 100644
index 000000000000..849bd8244272
--- /dev/null
+++ b/qa/releases/luminous-with-mgr.yaml
@@ -0,0 +1,10 @@
+tasks:
+- exec:
+    osd.0:
+      - ceph osd set require_luminous_osds
+- ceph.healthy:
+overrides:
+  ceph:
+    conf:
+      mon:
+        mon warn on osd down out interval zero: false
diff --git a/qa/suites/upgrade/kraken-x/stress-split/0-cluster/start.yaml b/qa/suites/upgrade/kraken-x/stress-split/0-cluster/start.yaml
index 9aef0e718a6d..4f40219b5267 100644
--- a/qa/suites/upgrade/kraken-x/stress-split/0-cluster/start.yaml
+++ b/qa/suites/upgrade/kraken-x/stress-split/0-cluster/start.yaml
@@ -10,6 +10,7 @@ roles:
 - - mon.a
   - mon.b
   - mon.c
+  - mgr.x
   - osd.0
   - osd.1
   - osd.2
diff --git a/qa/suites/upgrade/kraken-x/stress-split/2-partial-upgrade/firsthalf.yaml b/qa/suites/upgrade/kraken-x/stress-split/2-partial-upgrade/firsthalf.yaml
index 442dcf105a79..87fa1d5fa2c3 100644
--- a/qa/suites/upgrade/kraken-x/stress-split/2-partial-upgrade/firsthalf.yaml
+++ b/qa/suites/upgrade/kraken-x/stress-split/2-partial-upgrade/firsthalf.yaml
@@ -8,5 +8,5 @@ tasks:
     osd.0:
 - print: "**** done install.upgrade osd.0"
 - ceph.restart:
-    daemons: [mon.a,mon.b,mon.c,osd.0, osd.1, osd.2]
+    daemons: [mon.a,mon.b,mon.c,mgr.x,osd.0,osd.1,osd.2]
 - print: "**** done ceph.restart 1st half"
diff --git a/qa/suites/upgrade/kraken-x/stress-split/3-thrash/default.yaml b/qa/suites/upgrade/kraken-x/stress-split/3-thrash/default.yaml
index 955a855b00c9..73449101449b 100644
--- a/qa/suites/upgrade/kraken-x/stress-split/3-thrash/default.yaml
+++ b/qa/suites/upgrade/kraken-x/stress-split/3-thrash/default.yaml
@@ -19,4 +19,5 @@ stress-tasks:
     chance_thrash_cluster_full: 0
     chance_thrash_pg_upmap: 0
     chance_thrash_pg_upmap_items: 0
+    disable_objectstore_tool_tests: true
 - print: "**** done thrashosds 3-thrash"
diff --git a/qa/suites/upgrade/kraken-x/stress-split/5-finish-upgrade.yaml b/qa/suites/upgrade/kraken-x/stress-split/5-finish-upgrade.yaml
index 9693b680d03a..1d528cd5de75 100644
--- a/qa/suites/upgrade/kraken-x/stress-split/5-finish-upgrade.yaml
+++ b/qa/suites/upgrade/kraken-x/stress-split/5-finish-upgrade.yaml
@@ -1,6 +1,7 @@
 tasks:
 - install.upgrade:
     osd.3:
+    client.0:
 - ceph.restart:
     daemons: [osd.3, osd.4, osd.5]
     wait-for-healthy: false
diff --git a/qa/suites/upgrade/kraken-x/stress-split/6-luminous-with-mgr.yaml b/qa/suites/upgrade/kraken-x/stress-split/6-luminous-with-mgr.yaml
new file mode 120000
index 000000000000..5c72153e1f4c
--- /dev/null
+++ b/qa/suites/upgrade/kraken-x/stress-split/6-luminous-with-mgr.yaml
@@ -0,0 +1 @@
+../../../../releases/luminous-with-mgr.yaml
\ No newline at end of file
diff --git a/qa/suites/upgrade/kraken-x/stress-split/6-luminous.yaml b/qa/suites/upgrade/kraken-x/stress-split/6-luminous.yaml
deleted file mode 120000
index 5283ac73e1b2..000000000000
--- a/qa/suites/upgrade/kraken-x/stress-split/6-luminous.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../releases/luminous.yaml
\ No newline at end of file
diff --git a/qa/suites/upgrade/kraken-x/stress-split/objectstore b/qa/suites/upgrade/kraken-x/stress-split/objectstore
deleted file mode 120000
index 58b9a18c28ef..000000000000
--- a/qa/suites/upgrade/kraken-x/stress-split/objectstore
+++ /dev/null
@@ -1 +0,0 @@
-../../../../objectstore
\ No newline at end of file
diff --git a/qa/suites/upgrade/kraken-x/stress-split/objectstore/bluestore.yaml b/qa/suites/upgrade/kraken-x/stress-split/objectstore/bluestore.yaml
new file mode 120000
index 000000000000..d6445987d072
--- /dev/null
+++ b/qa/suites/upgrade/kraken-x/stress-split/objectstore/bluestore.yaml
@@ -0,0 +1 @@
+../../../../../objectstore/bluestore.yaml
\ No newline at end of file
diff --git a/qa/suites/upgrade/kraken-x/stress-split/objectstore/filestore-xfs.yaml b/qa/suites/upgrade/kraken-x/stress-split/objectstore/filestore-xfs.yaml
new file mode 120000
index 000000000000..03750e5adeba
--- /dev/null
+++ b/qa/suites/upgrade/kraken-x/stress-split/objectstore/filestore-xfs.yaml
@@ -0,0 +1 @@
+../../../../../objectstore/filestore-xfs.yaml
\ No newline at end of file