From 7120f22f5f4e4680bbe6c72d4f50ebd4905ec348 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 1 Jul 2013 16:09:45 -0700 Subject: [PATCH] upgrade: ignore mds restart order on rbd, rados tests Not relevant to rbd; put these in the fs upgrade matrix. --- suites/upgrade/rados-double/4-restart/upgrade_mds_osd_mon.yaml | 2 -- suites/upgrade/rados-double/4-restart/upgrade_osd_mon_mds.yaml | 2 -- suites/upgrade/rados-double/7-restart/mds-mon-osd.yaml | 2 -- suites/upgrade/rbd-double/4-restart/upgrade_mds_osd_mon.yaml | 2 -- suites/upgrade/rbd-double/4-restart/upgrade_osd_mon_mds.yaml | 2 -- suites/upgrade/rbd-double/7-restart/mds-mon-osd.yaml | 2 -- suites/upgrade/rgw-double/7-restart/mds-mon-osd.yaml | 2 -- 7 files changed, 14 deletions(-) delete mode 100644 suites/upgrade/rados-double/4-restart/upgrade_mds_osd_mon.yaml delete mode 100644 suites/upgrade/rados-double/4-restart/upgrade_osd_mon_mds.yaml delete mode 100644 suites/upgrade/rados-double/7-restart/mds-mon-osd.yaml delete mode 100644 suites/upgrade/rbd-double/4-restart/upgrade_mds_osd_mon.yaml delete mode 100644 suites/upgrade/rbd-double/4-restart/upgrade_osd_mon_mds.yaml delete mode 100644 suites/upgrade/rbd-double/7-restart/mds-mon-osd.yaml delete mode 100644 suites/upgrade/rgw-double/7-restart/mds-mon-osd.yaml diff --git a/suites/upgrade/rados-double/4-restart/upgrade_mds_osd_mon.yaml b/suites/upgrade/rados-double/4-restart/upgrade_mds_osd_mon.yaml deleted file mode 100644 index a8508353e78cd..0000000000000 --- a/suites/upgrade/rados-double/4-restart/upgrade_mds_osd_mon.yaml +++ /dev/null @@ -1,2 +0,0 @@ -tasks: -- ceph.restart: [mds.a, osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c] diff --git a/suites/upgrade/rados-double/4-restart/upgrade_osd_mon_mds.yaml b/suites/upgrade/rados-double/4-restart/upgrade_osd_mon_mds.yaml deleted file mode 100644 index e8fe288f657db..0000000000000 --- a/suites/upgrade/rados-double/4-restart/upgrade_osd_mon_mds.yaml +++ /dev/null @@ -1,2 +0,0 @@ -tasks: -- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c, mds.a] diff --git a/suites/upgrade/rados-double/7-restart/mds-mon-osd.yaml b/suites/upgrade/rados-double/7-restart/mds-mon-osd.yaml deleted file mode 100644 index d21800684d333..0000000000000 --- a/suites/upgrade/rados-double/7-restart/mds-mon-osd.yaml +++ /dev/null @@ -1,2 +0,0 @@ -tasks: -- ceph.restart: [mds.a, mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3] diff --git a/suites/upgrade/rbd-double/4-restart/upgrade_mds_osd_mon.yaml b/suites/upgrade/rbd-double/4-restart/upgrade_mds_osd_mon.yaml deleted file mode 100644 index a8508353e78cd..0000000000000 --- a/suites/upgrade/rbd-double/4-restart/upgrade_mds_osd_mon.yaml +++ /dev/null @@ -1,2 +0,0 @@ -tasks: -- ceph.restart: [mds.a, osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c] diff --git a/suites/upgrade/rbd-double/4-restart/upgrade_osd_mon_mds.yaml b/suites/upgrade/rbd-double/4-restart/upgrade_osd_mon_mds.yaml deleted file mode 100644 index e8fe288f657db..0000000000000 --- a/suites/upgrade/rbd-double/4-restart/upgrade_osd_mon_mds.yaml +++ /dev/null @@ -1,2 +0,0 @@ -tasks: -- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c, mds.a] diff --git a/suites/upgrade/rbd-double/7-restart/mds-mon-osd.yaml b/suites/upgrade/rbd-double/7-restart/mds-mon-osd.yaml deleted file mode 100644 index d21800684d333..0000000000000 --- a/suites/upgrade/rbd-double/7-restart/mds-mon-osd.yaml +++ /dev/null @@ -1,2 +0,0 @@ -tasks: -- ceph.restart: [mds.a, mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3] diff --git a/suites/upgrade/rgw-double/7-restart/mds-mon-osd.yaml b/suites/upgrade/rgw-double/7-restart/mds-mon-osd.yaml deleted file mode 100644 index d21800684d333..0000000000000 --- a/suites/upgrade/rgw-double/7-restart/mds-mon-osd.yaml +++ /dev/null @@ -1,2 +0,0 @@ -tasks: -- ceph.restart: [mds.a, mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3] -- 2.39.5