Removed upgrade/dumpling from master branch as it should be only in dumpling branch

Signed-off-by: Yuri Weinstein <yuri.weinstein@inktank.com>

diff --git a/suites/upgrade/dumpling/fs/% b/suites/upgrade/dumpling/fs/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/dumpling/fs/0-cluster/start.yaml b/suites/upgrade/dumpling/fs/0-cluster/start.yaml
deleted file mode 100644 (file)
index c1acc4e..0000000
--- a/suites/upgrade/dumpling/fs/0-cluster/start.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - scrub
-    fs: xfs
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-  - osd.2
-- - mon.b
-  - mon.c
-  - osd.3
-  - osd.4
-  - osd.5
-  - client.0

diff --git a/suites/upgrade/dumpling/fs/1-dumpling-install/cuttlefish.v0.67.1.yaml b/suites/upgrade/dumpling/fs/1-dumpling-install/cuttlefish.v0.67.1.yaml
deleted file mode 100644 (file)
index 032340b..0000000
--- a/suites/upgrade/dumpling/fs/1-dumpling-install/cuttlefish.v0.67.1.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- install:
-    branch: cuttlefish
-- ceph:
-- install.upgrade:
-    all:
-      tag: v0.67.1
-- ceph.restart:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/dumpling/fs/1-dumpling-install/v0.67.1.yaml b/suites/upgrade/dumpling/fs/1-dumpling-install/v0.67.1.yaml
deleted file mode 100644 (file)
index a5bf1fa..0000000
--- a/suites/upgrade/dumpling/fs/1-dumpling-install/v0.67.1.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.67.1
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/dumpling/fs/1-dumpling-install/v0.67.3.yaml b/suites/upgrade/dumpling/fs/1-dumpling-install/v0.67.3.yaml
deleted file mode 100644 (file)
index d0c1861..0000000
--- a/suites/upgrade/dumpling/fs/1-dumpling-install/v0.67.3.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.67.3
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/dumpling/fs/1-dumpling-install/v0.67.5.yaml b/suites/upgrade/dumpling/fs/1-dumpling-install/v0.67.5.yaml
deleted file mode 100644 (file)
index 611b6d6..0000000
--- a/suites/upgrade/dumpling/fs/1-dumpling-install/v0.67.5.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.67.5
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/dumpling/fs/1-dumpling-install/v0.67.7.yaml b/suites/upgrade/dumpling/fs/1-dumpling-install/v0.67.7.yaml
deleted file mode 100644 (file)
index 7cb8fcc..0000000
--- a/suites/upgrade/dumpling/fs/1-dumpling-install/v0.67.7.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.67.7
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/dumpling/fs/1-dumpling-install/v0.67.9.yaml b/suites/upgrade/dumpling/fs/1-dumpling-install/v0.67.9.yaml
deleted file mode 100644 (file)
index 41523ac..0000000
--- a/suites/upgrade/dumpling/fs/1-dumpling-install/v0.67.9.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.67.9
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/dumpling/fs/2-workload/blogbench.yaml b/suites/upgrade/dumpling/fs/2-workload/blogbench.yaml
deleted file mode 100644 (file)
index 0cd59ea..0000000
--- a/suites/upgrade/dumpling/fs/2-workload/blogbench.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-workload:
-   workunit:
-      clients:
-         all:
-           - suites/blogbench.sh

diff --git a/suites/upgrade/dumpling/fs/3-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade/dumpling/fs/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
deleted file mode 100644 (file)
index 38bba91..0000000
--- a/suites/upgrade/dumpling/fs/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: dumpling
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]

diff --git a/suites/upgrade/dumpling/fs/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/dumpling/fs/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
deleted file mode 100644 (file)
index 5b617fd..0000000
--- a/suites/upgrade/dumpling/fs/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: dumpling
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]

diff --git a/suites/upgrade/dumpling/fs/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/dumpling/fs/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
deleted file mode 100644 (file)
index 91c146a..0000000
--- a/suites/upgrade/dumpling/fs/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: dumpling
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]

diff --git a/suites/upgrade/dumpling/fs/4-final/monthrash.yaml b/suites/upgrade/dumpling/fs/4-final/monthrash.yaml
deleted file mode 100644 (file)
index 13af446..0000000
--- a/suites/upgrade/dumpling/fs/4-final/monthrash.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-tasks:
-- mon_thrash:
-    revive_delay: 20
-    thrash_delay: 1
-- ceph-fuse:
-- workunit:
-    clients:
-      client.0:
-        - suites/dbench.sh
-

diff --git a/suites/upgrade/dumpling/fs/4-final/osdthrash.yaml b/suites/upgrade/dumpling/fs/4-final/osdthrash.yaml
deleted file mode 100644 (file)
index dbd7191..0000000
--- a/suites/upgrade/dumpling/fs/4-final/osdthrash.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - wrongly marked me down
-    - objects unfound and apparently lost
-    - log bound mismatch
-tasks:
-- thrashosds:
-    timeout: 1200
-    chance_pgnum_grow: 1
-    chance_pgpnum_fix: 1
-- ceph-fuse:
-- workunit:
-    clients:
-      all:
-        - suites/iogen.sh
-

diff --git a/suites/upgrade/dumpling/rados/% b/suites/upgrade/dumpling/rados/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/dumpling/rados/0-cluster/start.yaml b/suites/upgrade/dumpling/rados/0-cluster/start.yaml
deleted file mode 100644 (file)
index c1acc4e..0000000
--- a/suites/upgrade/dumpling/rados/0-cluster/start.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - scrub
-    fs: xfs
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-  - osd.2
-- - mon.b
-  - mon.c
-  - osd.3
-  - osd.4
-  - osd.5
-  - client.0

diff --git a/suites/upgrade/dumpling/rados/1-dumpling-install/cuttlefish.v0.67.1.yaml b/suites/upgrade/dumpling/rados/1-dumpling-install/cuttlefish.v0.67.1.yaml
deleted file mode 100644 (file)
index 032340b..0000000
--- a/suites/upgrade/dumpling/rados/1-dumpling-install/cuttlefish.v0.67.1.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- install:
-    branch: cuttlefish
-- ceph:
-- install.upgrade:
-    all:
-      tag: v0.67.1
-- ceph.restart:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/dumpling/rados/1-dumpling-install/v0.67.1.yaml b/suites/upgrade/dumpling/rados/1-dumpling-install/v0.67.1.yaml
deleted file mode 100644 (file)
index a5bf1fa..0000000
--- a/suites/upgrade/dumpling/rados/1-dumpling-install/v0.67.1.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.67.1
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/dumpling/rados/1-dumpling-install/v0.67.3.yaml b/suites/upgrade/dumpling/rados/1-dumpling-install/v0.67.3.yaml
deleted file mode 100644 (file)
index d0c1861..0000000
--- a/suites/upgrade/dumpling/rados/1-dumpling-install/v0.67.3.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.67.3
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/dumpling/rados/1-dumpling-install/v0.67.5.yaml b/suites/upgrade/dumpling/rados/1-dumpling-install/v0.67.5.yaml
deleted file mode 100644 (file)
index 611b6d6..0000000
--- a/suites/upgrade/dumpling/rados/1-dumpling-install/v0.67.5.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.67.5
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/dumpling/rados/1-dumpling-install/v0.67.7.yaml b/suites/upgrade/dumpling/rados/1-dumpling-install/v0.67.7.yaml
deleted file mode 100644 (file)
index 7cb8fcc..0000000
--- a/suites/upgrade/dumpling/rados/1-dumpling-install/v0.67.7.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.67.7
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/dumpling/rados/1-dumpling-install/v0.67.9.yaml b/suites/upgrade/dumpling/rados/1-dumpling-install/v0.67.9.yaml
deleted file mode 100644 (file)
index 41523ac..0000000
--- a/suites/upgrade/dumpling/rados/1-dumpling-install/v0.67.9.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.67.9
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/dumpling/rados/2-workload/testrados.yaml b/suites/upgrade/dumpling/rados/2-workload/testrados.yaml
deleted file mode 100644 (file)
index 8eaab19..0000000
--- a/suites/upgrade/dumpling/rados/2-workload/testrados.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-workload:
-  rados:
-    clients: [client.0]
-    ops: 2000
-    objects: 50
-    op_weights:
-      read: 100
-      write: 100
-      delete: 50
-      snap_create: 50
-      snap_remove: 50
-      rollback: 50
-

diff --git a/suites/upgrade/dumpling/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade/dumpling/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
deleted file mode 100644 (file)
index 38bba91..0000000
--- a/suites/upgrade/dumpling/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: dumpling
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]

diff --git a/suites/upgrade/dumpling/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/dumpling/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
deleted file mode 100644 (file)
index 5b617fd..0000000
--- a/suites/upgrade/dumpling/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: dumpling
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]

diff --git a/suites/upgrade/dumpling/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/dumpling/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
deleted file mode 100644 (file)
index 801bab9..0000000
--- a/suites/upgrade/dumpling/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: dumpling
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60

diff --git a/suites/upgrade/dumpling/rados/4-final/monthrash.yaml b/suites/upgrade/dumpling/rados/4-final/monthrash.yaml
deleted file mode 100644 (file)
index 810ba1b..0000000
--- a/suites/upgrade/dumpling/rados/4-final/monthrash.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-tasks:
-- mon_thrash:
-    revive_delay: 20
-    thrash_delay: 1
-- workunit:
-    clients:
-      client.0:
-        - rados/test.sh
-

diff --git a/suites/upgrade/dumpling/rados/4-final/osdthrash.yaml b/suites/upgrade/dumpling/rados/4-final/osdthrash.yaml
deleted file mode 100644 (file)
index f815042..0000000
--- a/suites/upgrade/dumpling/rados/4-final/osdthrash.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - wrongly marked me down
-    - objects unfound and apparently lost
-    - log bound mismatch
-tasks:
-- thrashosds:
-    timeout: 1200
-    chance_pgnum_grow: 1
-    chance_pgpnum_fix: 1
-- rados:
-    clients: [client.0]
-    ops: 2000
-    objects: 50
-    op_weights:
-      read: 100
-      write: 100
-      delete: 50
-      snap_create: 50
-      snap_remove: 50
-      rollback: 50
-

diff --git a/suites/upgrade/dumpling/rbd/% b/suites/upgrade/dumpling/rbd/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/dumpling/rbd/0-cluster/start.yaml b/suites/upgrade/dumpling/rbd/0-cluster/start.yaml
deleted file mode 100644 (file)
index c1acc4e..0000000
--- a/suites/upgrade/dumpling/rbd/0-cluster/start.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - scrub
-    fs: xfs
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-  - osd.2
-- - mon.b
-  - mon.c
-  - osd.3
-  - osd.4
-  - osd.5
-  - client.0

diff --git a/suites/upgrade/dumpling/rbd/1-dumpling-install/cuttlefish.v0.67.1.yaml b/suites/upgrade/dumpling/rbd/1-dumpling-install/cuttlefish.v0.67.1.yaml
deleted file mode 100644 (file)
index 032340b..0000000
--- a/suites/upgrade/dumpling/rbd/1-dumpling-install/cuttlefish.v0.67.1.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- install:
-    branch: cuttlefish
-- ceph:
-- install.upgrade:
-    all:
-      tag: v0.67.1
-- ceph.restart:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/dumpling/rbd/1-dumpling-install/v0.67.1.yaml b/suites/upgrade/dumpling/rbd/1-dumpling-install/v0.67.1.yaml
deleted file mode 100644 (file)
index a5bf1fa..0000000
--- a/suites/upgrade/dumpling/rbd/1-dumpling-install/v0.67.1.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.67.1
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/dumpling/rbd/1-dumpling-install/v0.67.3.yaml b/suites/upgrade/dumpling/rbd/1-dumpling-install/v0.67.3.yaml
deleted file mode 100644 (file)
index d0c1861..0000000
--- a/suites/upgrade/dumpling/rbd/1-dumpling-install/v0.67.3.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.67.3
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/dumpling/rbd/1-dumpling-install/v0.67.5.yaml b/suites/upgrade/dumpling/rbd/1-dumpling-install/v0.67.5.yaml
deleted file mode 100644 (file)
index 611b6d6..0000000
--- a/suites/upgrade/dumpling/rbd/1-dumpling-install/v0.67.5.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.67.5
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/dumpling/rbd/1-dumpling-install/v0.67.7.yaml b/suites/upgrade/dumpling/rbd/1-dumpling-install/v0.67.7.yaml
deleted file mode 100644 (file)
index 7cb8fcc..0000000
--- a/suites/upgrade/dumpling/rbd/1-dumpling-install/v0.67.7.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.67.7
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/dumpling/rbd/1-dumpling-install/v0.67.9.yaml b/suites/upgrade/dumpling/rbd/1-dumpling-install/v0.67.9.yaml
deleted file mode 100644 (file)
index 41523ac..0000000
--- a/suites/upgrade/dumpling/rbd/1-dumpling-install/v0.67.9.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.67.9
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/dumpling/rbd/2-workload/rbd.yaml b/suites/upgrade/dumpling/rbd/2-workload/rbd.yaml
deleted file mode 100644 (file)
index ce2fabe..0000000
--- a/suites/upgrade/dumpling/rbd/2-workload/rbd.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-workload:
-   sequential:
-   - workunit:
-       clients:
-         client.0:
-           - rbd/import_export.sh
-       env:
-         RBD_CREATE_ARGS: --new-format
-   - workunit:
-       clients:
-         client.0:
-           - cls/test_cls_rbd.sh
- 
-

diff --git a/suites/upgrade/dumpling/rbd/3-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade/dumpling/rbd/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
deleted file mode 100644 (file)
index 38bba91..0000000
--- a/suites/upgrade/dumpling/rbd/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: dumpling
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]

diff --git a/suites/upgrade/dumpling/rbd/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/dumpling/rbd/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
deleted file mode 100644 (file)
index 5b617fd..0000000
--- a/suites/upgrade/dumpling/rbd/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: dumpling
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]

diff --git a/suites/upgrade/dumpling/rbd/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/dumpling/rbd/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
deleted file mode 100644 (file)
index 91c146a..0000000
--- a/suites/upgrade/dumpling/rbd/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: dumpling
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]

diff --git a/suites/upgrade/dumpling/rbd/4-final/monthrash.yaml b/suites/upgrade/dumpling/rbd/4-final/monthrash.yaml
deleted file mode 100644 (file)
index 593191c..0000000
--- a/suites/upgrade/dumpling/rbd/4-final/monthrash.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- mon_thrash:
-    revive_delay: 20
-    thrash_delay: 1
-- workunit:
-    clients:
-      client.0:
-        - rbd/copy.sh
-    env:
-      RBD_CREATE_ARGS: --new-format
-

diff --git a/suites/upgrade/dumpling/rbd/4-final/osdthrash.yaml b/suites/upgrade/dumpling/rbd/4-final/osdthrash.yaml
deleted file mode 100644 (file)
index 575fd79..0000000
--- a/suites/upgrade/dumpling/rbd/4-final/osdthrash.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - wrongly marked me down
-    - objects unfound and apparently lost
-    - log bound mismatch
-tasks:
-- thrashosds:
-    timeout: 1200
-    chance_pgnum_grow: 1
-    chance_pgpnum_fix: 1
-- workunit:
-    clients:
-      client.0:
-        - rbd/test_lock_fence.sh
-

diff --git a/suites/upgrade/dumpling/rgw/% b/suites/upgrade/dumpling/rgw/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/dumpling/rgw/0-cluster/start.yaml b/suites/upgrade/dumpling/rgw/0-cluster/start.yaml
deleted file mode 100644 (file)
index c1acc4e..0000000
--- a/suites/upgrade/dumpling/rgw/0-cluster/start.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - scrub
-    fs: xfs
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-  - osd.2
-- - mon.b
-  - mon.c
-  - osd.3
-  - osd.4
-  - osd.5
-  - client.0

diff --git a/suites/upgrade/dumpling/rgw/1-dumpling-install/cuttlefish.v0.67.1.yaml b/suites/upgrade/dumpling/rgw/1-dumpling-install/cuttlefish.v0.67.1.yaml
deleted file mode 100644 (file)
index 032340b..0000000
--- a/suites/upgrade/dumpling/rgw/1-dumpling-install/cuttlefish.v0.67.1.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- install:
-    branch: cuttlefish
-- ceph:
-- install.upgrade:
-    all:
-      tag: v0.67.1
-- ceph.restart:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/dumpling/rgw/1-dumpling-install/v0.67.1.yaml b/suites/upgrade/dumpling/rgw/1-dumpling-install/v0.67.1.yaml
deleted file mode 100644 (file)
index a5bf1fa..0000000
--- a/suites/upgrade/dumpling/rgw/1-dumpling-install/v0.67.1.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.67.1
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/dumpling/rgw/1-dumpling-install/v0.67.3.yaml b/suites/upgrade/dumpling/rgw/1-dumpling-install/v0.67.3.yaml
deleted file mode 100644 (file)
index d0c1861..0000000
--- a/suites/upgrade/dumpling/rgw/1-dumpling-install/v0.67.3.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.67.3
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/dumpling/rgw/1-dumpling-install/v0.67.5.yaml b/suites/upgrade/dumpling/rgw/1-dumpling-install/v0.67.5.yaml
deleted file mode 100644 (file)
index 611b6d6..0000000
--- a/suites/upgrade/dumpling/rgw/1-dumpling-install/v0.67.5.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.67.5
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/dumpling/rgw/1-dumpling-install/v0.67.7.yaml b/suites/upgrade/dumpling/rgw/1-dumpling-install/v0.67.7.yaml
deleted file mode 100644 (file)
index 7cb8fcc..0000000
--- a/suites/upgrade/dumpling/rgw/1-dumpling-install/v0.67.7.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.67.7
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/dumpling/rgw/1-dumpling-install/v0.67.9.yaml b/suites/upgrade/dumpling/rgw/1-dumpling-install/v0.67.9.yaml
deleted file mode 100644 (file)
index 41523ac..0000000
--- a/suites/upgrade/dumpling/rgw/1-dumpling-install/v0.67.9.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    tag: v0.67.9
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence

diff --git a/suites/upgrade/dumpling/rgw/2-workload/testrgw.yaml b/suites/upgrade/dumpling/rgw/2-workload/testrgw.yaml
deleted file mode 100644 (file)
index 77d7e16..0000000
--- a/suites/upgrade/dumpling/rgw/2-workload/testrgw.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-workload:
-  sequential:
-  - rgw: [client.0]
-  - s3tests:
-      client.0:
-         rgw_server: client.0
-

diff --git a/suites/upgrade/dumpling/rgw/3-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade/dumpling/rgw/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
deleted file mode 100644 (file)
index ff91290..0000000
--- a/suites/upgrade/dumpling/rgw/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: dumpling
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]
-   - sleep:
-       duration: 30
-   - ceph.restart: [rgw.client.0]

diff --git a/suites/upgrade/dumpling/rgw/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/dumpling/rgw/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
deleted file mode 100644 (file)
index 75face2..0000000
--- a/suites/upgrade/dumpling/rgw/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: dumpling
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]
-   - sleep:
-       duration: 30
-   - ceph.restart: [rgw.client.0]

diff --git a/suites/upgrade/dumpling/rgw/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/dumpling/rgw/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
deleted file mode 100644 (file)
index a08c669..0000000
--- a/suites/upgrade/dumpling/rgw/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: dumpling
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.4]
-   - sleep:
-       duration: 30
-   - ceph.restart: [osd.5]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [rgw.client.0]

diff --git a/suites/upgrade/dumpling/rgw/4-final/monthrash.yaml b/suites/upgrade/dumpling/rgw/4-final/monthrash.yaml
deleted file mode 100644 (file)
index 9361edc..0000000
--- a/suites/upgrade/dumpling/rgw/4-final/monthrash.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- mon_thrash:
-    revive_delay: 20
-    thrash_delay: 1
-- swift:
-    client.0:
-      rgw_server: client.0
-

diff --git a/suites/upgrade/dumpling/rgw/4-final/osdthrash.yaml b/suites/upgrade/dumpling/rgw/4-final/osdthrash.yaml
deleted file mode 100644 (file)
index 6cf6d86..0000000
--- a/suites/upgrade/dumpling/rgw/4-final/osdthrash.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - wrongly marked me down
-    - objects unfound and apparently lost
-    - log bound mismatch
-tasks:
-- thrashosds:
-    timeout: 1200
-    chance_pgnum_grow: 1
-    chance_pgpnum_fix: 1
-- swift:
-    client.0:
-      rgw_server: client.0
-