From: Sage Weil <sage@redhat.com>
Date: Thu, 1 Dec 2016 20:48:13 +0000 (-0500)
Subject: upgrade/hammer-jewel-x: no mds, no fs tests
X-Git-Tag: v11.1.1~58^2^2~10^2~4
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3ea7610dc2d465be414707f4c8c80de86ebc5172;p=ceph-ci.git

upgrade/hammer-jewel-x: no mds, no fs tests
---

diff --git a/suites/upgrade/hammer-jewel-x/parallel/0-cluster/start.yaml b/suites/upgrade/hammer-jewel-x/parallel/0-cluster/start.yaml
index 5caa3dfb946..25cc17f0a33 100644
--- a/suites/upgrade/hammer-jewel-x/parallel/0-cluster/start.yaml
+++ b/suites/upgrade/hammer-jewel-x/parallel/0-cluster/start.yaml
@@ -6,7 +6,6 @@ overrides:
         mon debug unsafe allow tier with nonempty snaps: true
 roles:
 - - mon.a
-  - mds.a
   - osd.0
   - osd.1
 - - mon.b
diff --git a/suites/upgrade/hammer-jewel-x/parallel/2-workload/blogbench.yaml b/suites/upgrade/hammer-jewel-x/parallel/2-workload/blogbench.yaml
deleted file mode 100644
index 021fcc68190..00000000000
--- a/suites/upgrade/hammer-jewel-x/parallel/2-workload/blogbench.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-meta:
-- desc: |
-   run a cephfs stress test
-   mount ceph-fuse on client.2 before running workunit
-workload:
-  full_sequential:
-  - sequential:
-    - ceph-fuse:
-    - print: "**** done ceph-fuse 2-workload"
-    - workunit:
-        clients:
-           client.2:
-            - suites/blogbench.sh
-    - print: "**** done suites/blogbench.sh 2-workload"
diff --git a/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-osd-mds-mon.yaml b/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-osd-mds-mon.yaml
index b5acf98f94d..a185cd5cc84 100644
--- a/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-osd-mds-mon.yaml
+++ b/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-osd-mds-mon.yaml
@@ -13,9 +13,6 @@ upgrade-sequence:
    - ceph.restart:
        daemons: [mon.a]
        wait-for-healthy: false
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
    - sleep:
        duration: 60
    - print: "**** running mixed versions of osds and mons"
diff --git a/suites/upgrade/hammer-jewel-x/parallel/6-workload/blogbench.yaml b/suites/upgrade/hammer-jewel-x/parallel/6-workload/blogbench.yaml
deleted file mode 100644
index 021fcc68190..00000000000
--- a/suites/upgrade/hammer-jewel-x/parallel/6-workload/blogbench.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-meta:
-- desc: |
-   run a cephfs stress test
-   mount ceph-fuse on client.2 before running workunit
-workload:
-  full_sequential:
-  - sequential:
-    - ceph-fuse:
-    - print: "**** done ceph-fuse 2-workload"
-    - workunit:
-        clients:
-           client.2:
-            - suites/blogbench.sh
-    - print: "**** done suites/blogbench.sh 2-workload"
diff --git a/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-all.yaml
index 02cba21c2c8..76d474d8594 100644
--- a/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-all.yaml
+++ b/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-all.yaml
@@ -4,7 +4,7 @@ meta:
 upgrade-sequence:
    sequential:
    - ceph.restart:
-       daemons: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3]
+       daemons: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3]
        wait-for-healthy: false
        wait-for-osds-up: true
    - exec:
diff --git a/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-by-daemon.yaml b/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-by-daemon.yaml
index b5542b45157..42ba47ddab6 100644
--- a/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-by-daemon.yaml
+++ b/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-by-daemon.yaml
@@ -2,7 +2,7 @@ meta:
 - desc: |
    upgrade the ceph cluster,
    upgrate in two steps
-   step one ordering: mon.a, osd.0, osd.1, mds.a
+   step one ordering: mon.a, osd.0, osd.1
    step two ordering: mon.b, mon.c, osd.2, osd.3
    ceph expected to be healthy state after each step
 upgrade-sequence:
@@ -15,9 +15,6 @@ upgrade-sequence:
    - ceph.restart:
        daemons: [osd.0, osd.1]
        wait-for-healthy: true
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
    - sleep:
        duration: 60
    - print: "**** running mixed versions of osds and mons"
diff --git a/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/blogbench.yaml b/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/blogbench.yaml
deleted file mode 100644
index d2629c03f68..00000000000
--- a/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/blogbench.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-meta:
-- desc: |
-   run a cephfs stress test
-   mount ceph-fuse on client.3 before running workunit
-tasks:
-- sequential:
-  - ceph-fuse:
-  - print: "**** done ceph-fuse 5-final-workload"
-  - workunit:
-      clients:
-         client.3:
-          - suites/blogbench.sh
-  - print: "**** done suites/blogbench.sh 5-final-workload"