suites/upgrade: remove stable upgrade suites

These are maintained in their respective branches (e.g.,
the latest suites/upgrade/hammer is in the hammer branch).

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

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

diff --git a/suites/upgrade/giant/0-cluster/start.yaml b/suites/upgrade/giant/0-cluster/start.yaml
deleted file mode 100644 (file)
index 5f2f971..0000000
--- a/suites/upgrade/giant/0-cluster/start.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - scrub
-    - scrub mismatch
-    - ScrubResult
-    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
-  - client.1

diff --git a/suites/upgrade/giant/1-install/latest_firefly_release.yaml b/suites/upgrade/giant/1-install/latest_firefly_release.yaml
deleted file mode 100644 (file)
index 8151600..0000000
--- a/suites/upgrade/giant/1-install/latest_firefly_release.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-# change tag to the latest firefly released version
-- install:
-    branch: firefly
-- print: "**** done latest firefly install"
-- ceph:
-   fs: xfs
-- parallel:
-   - workload
-   - upgrade-sequence
-- print: "**** done parallel"

diff --git a/suites/upgrade/giant/2-workload/blogbench.yaml b/suites/upgrade/giant/2-workload/blogbench.yaml
deleted file mode 100644 (file)
index 93efdf1..0000000
--- a/suites/upgrade/giant/2-workload/blogbench.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-workload:
-  sequential:
-  - workunit:
-      clients:
-         client.0:
-          - suites/blogbench.sh
-  - print: "**** done suites/blogbench.sh"

diff --git a/suites/upgrade/giant/2-workload/rbd.yaml b/suites/upgrade/giant/2-workload/rbd.yaml
deleted file mode 100644 (file)
index 8ffb0ea..0000000
--- a/suites/upgrade/giant/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
-   - print: "**** done rbd/import_export.sh"
-   - workunit:
-       clients:
-         client.0:
-           - cls/test_cls_rbd.sh
-   - print: "**** done cls/test_cls_rbd.sh"

diff --git a/suites/upgrade/giant/2-workload/s3tests.yaml b/suites/upgrade/giant/2-workload/s3tests.yaml
deleted file mode 100644 (file)
index a5882ac..0000000
--- a/suites/upgrade/giant/2-workload/s3tests.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-workload:
-  sequential:
-  - rgw: [client.0]
-  - print: "**** done rgw: [client.0]"
-  - s3tests:
-      client.0:
-        force-branch: firefly-original
-        rgw_server: client.0
-  - print: "**** done s3tests"

diff --git a/suites/upgrade/giant/2-workload/testrados.yaml b/suites/upgrade/giant/2-workload/testrados.yaml
deleted file mode 100644 (file)
index 49339ec..0000000
--- a/suites/upgrade/giant/2-workload/testrados.yaml
+++ /dev/null
@@ -1,12 +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/giant/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/giant/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
deleted file mode 100644 (file)
index e87a8d1..0000000
--- a/suites/upgrade/giant/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: giant
-   - print: "**** done install.upgrade giant"
-   - 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
-   - print: "**** done ceph.restart all"

diff --git a/suites/upgrade/giant/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/giant/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
deleted file mode 100644 (file)
index adcf1b6..0000000
--- a/suites/upgrade/giant/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: giant
-   - print: "**** done install.upgrade giant"
-   - 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
-   - print: "**** done ceph.restart all"

diff --git a/suites/upgrade/giant/4-final/+ b/suites/upgrade/giant/4-final/+
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/giant/4-final/monthrash.yaml b/suites/upgrade/giant/4-final/monthrash.yaml
deleted file mode 100644 (file)
index 7833c1c..0000000
--- a/suites/upgrade/giant/4-final/monthrash.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-tasks:
-- mon_thrash:
-    revive_delay: 20
-    thrash_delay: 1
-- print: "**** done mon_thrash"
-- ceph-fuse:
-- print: "**** done ceph-fuse"
-- workunit:
-    clients:
-      client.0:
-        - suites/dbench.sh
-- print: "**** done suites/dbench.sh"
-

diff --git a/suites/upgrade/giant/4-final/osdthrash.yaml b/suites/upgrade/giant/4-final/osdthrash.yaml
deleted file mode 100644 (file)
index 44b5bce..0000000
--- a/suites/upgrade/giant/4-final/osdthrash.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - wrongly marked me down
-    - objects unfound and apparently lost
-    - log bound mismatch
-tasks:
-- sequential:
-  - thrashosds:
-      timeout: 1200
-      chance_pgnum_grow: 1
-      chance_pgpnum_fix: 1
-  - print: "**** done thrashosds"
-  - workunit:
-      clients:
-        client.0:
-           - suites/iogen.sh
-  - print: "**** done suites/iogen.sh"
-

diff --git a/suites/upgrade/giant/4-final/testrgw.yaml b/suites/upgrade/giant/4-final/testrgw.yaml
deleted file mode 100644 (file)
index 054b0ff..0000000
--- a/suites/upgrade/giant/4-final/testrgw.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- sequential:
-  - rgw: [client.1]
-  - s3tests:
-      client.1:
-         rgw_server: client.1
-  - print: "**** done s3tests"

diff --git a/suites/upgrade/giant/distros b/suites/upgrade/giant/distros
deleted file mode 120000 (symlink)
index dd0d7f1..0000000
--- a/suites/upgrade/giant/distros
+++ /dev/null
@@ -1 +0,0 @@
-../../../distros/supported/
\ No newline at end of file

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

diff --git a/suites/upgrade/hammer/newer/0-cluster/start.yaml b/suites/upgrade/hammer/newer/0-cluster/start.yaml
deleted file mode 100644 (file)
index e417cec..0000000
--- a/suites/upgrade/hammer/newer/0-cluster/start.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - scrub
-    - scrub mismatch
-    - ScrubResult
-    - failed to encode
-    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
-  - client.1

diff --git a/suites/upgrade/hammer/newer/1-install/v0.94.2.yaml b/suites/upgrade/hammer/newer/1-install/v0.94.2.yaml
deleted file mode 100644 (file)
index c380658..0000000
--- a/suites/upgrade/hammer/newer/1-install/v0.94.2.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-tasks:
-- install:
-    tag: v0.94.2
-- print: "**** done v0.94.2 install"
-- ceph:
-   fs: xfs
-- parallel:
-   - workload
-   - upgrade-sequence
-- print: "**** done parallel v0.94.2"

diff --git a/suites/upgrade/hammer/newer/2-workload/blogbench.yaml b/suites/upgrade/hammer/newer/2-workload/blogbench.yaml
deleted file mode 100644 (file)
index e3d652e..0000000
--- a/suites/upgrade/hammer/newer/2-workload/blogbench.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-workload:
-  sequential:
-  - workunit:
-      clients:
-         client.0:
-          - suites/blogbench.sh
-  - print: "**** done suites/blogbench.sh 2-workload"

diff --git a/suites/upgrade/hammer/newer/2-workload/rbd.yaml b/suites/upgrade/hammer/newer/2-workload/rbd.yaml
deleted file mode 100644 (file)
index 5960273..0000000
--- a/suites/upgrade/hammer/newer/2-workload/rbd.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-workload:
-   sequential:
-   - workunit:
-       clients:
-         client.0:
-           - rbd/import_export.sh
-       env:
-         RBD_CREATE_ARGS: --new-format
-   - print: "**** done rbd/import_export.sh 2-workload"

diff --git a/suites/upgrade/hammer/newer/2-workload/s3tests.yaml b/suites/upgrade/hammer/newer/2-workload/s3tests.yaml
deleted file mode 100644 (file)
index 9c71a11..0000000
--- a/suites/upgrade/hammer/newer/2-workload/s3tests.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-workload:
-  sequential:
-  - rgw: 
-      client.0:
-      default_idle_timeout: 300
-  - print: "**** done rgw: [client.0] 2-workload"
-  - s3tests:
-      client.0:
-        force-branch: giant
-        rgw_server: client.0
-        idle_timeout: 300
-  - print: "**** done s3tests 2-workload"

diff --git a/suites/upgrade/hammer/newer/2-workload/testrados.yaml b/suites/upgrade/hammer/newer/2-workload/testrados.yaml
deleted file mode 100644 (file)
index 49339ec..0000000
--- a/suites/upgrade/hammer/newer/2-workload/testrados.yaml
+++ /dev/null
@@ -1,12 +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/hammer/newer/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/hammer/newer/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
deleted file mode 100644 (file)
index b697e2c..0000000
--- a/suites/upgrade/hammer/newer/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-   - print: "**** done install.upgrade hammer"
-   - 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
-   - print: "**** done ceph.restart all"

diff --git a/suites/upgrade/hammer/newer/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/hammer/newer/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
deleted file mode 100644 (file)
index 0f773e4..0000000
--- a/suites/upgrade/hammer/newer/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-   - print: "**** done install.upgrade hammer"
-   - 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
-   - print: "**** done ceph.restart all"

diff --git a/suites/upgrade/hammer/newer/4-final/+ b/suites/upgrade/hammer/newer/4-final/+
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/hammer/newer/4-final/monthrash.yaml b/suites/upgrade/hammer/newer/4-final/monthrash.yaml
deleted file mode 100644 (file)
index 3774702..0000000
--- a/suites/upgrade/hammer/newer/4-final/monthrash.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-tasks:
-- mon_thrash:
-    revive_delay: 20
-    thrash_delay: 1
-- print: "**** done mon_thrash 4-workload"
-- ceph-fuse:
-- print: "**** done ceph-fuse 4-workload"
-- workunit:
-    clients:
-      client.0:
-        - suites/dbench.sh
-- print: "**** done suites/dbench.sh 4-workload"
-

diff --git a/suites/upgrade/hammer/newer/4-final/osdthrash.yaml b/suites/upgrade/hammer/newer/4-final/osdthrash.yaml
deleted file mode 100644 (file)
index b4740ad..0000000
--- a/suites/upgrade/hammer/newer/4-final/osdthrash.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - wrongly marked me down
-    - objects unfound and apparently lost
-    - log bound mismatch
-    - failed to encode
-tasks:
-- sequential:
-  - thrashosds:
-      timeout: 1200
-      chance_pgnum_grow: 1
-      chance_pgpnum_fix: 1
-  - print: "**** done thrashosds 4-workload"
-  - workunit:
-      clients:
-        client.0:
-           - suites/iogen.sh
-  - print: "**** done suites/iogen.sh 4-workload"
-

diff --git a/suites/upgrade/hammer/newer/4-final/testrgw.yaml b/suites/upgrade/hammer/newer/4-final/testrgw.yaml
deleted file mode 100644 (file)
index 5331c85..0000000
--- a/suites/upgrade/hammer/newer/4-final/testrgw.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-tasks:
-- sequential:
-  - rgw: [client.1]
-  - print: "**** done rgw: [client.1] 4-workload"
-  - s3tests:
-      client.1:
-         force-branch: hammer
-         rgw_server: client.1
-  - print: "**** done s3tests 4-workload"

diff --git a/suites/upgrade/hammer/newer/distros b/suites/upgrade/hammer/newer/distros
deleted file mode 120000 (symlink)
index ca99fee..0000000
--- a/suites/upgrade/hammer/newer/distros
+++ /dev/null
@@ -1 +0,0 @@
-../../../../distros/supported/
\ No newline at end of file

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

diff --git a/suites/upgrade/hammer/older/0-cluster/start.yaml b/suites/upgrade/hammer/older/0-cluster/start.yaml
deleted file mode 100644 (file)
index fe647cc..0000000
--- a/suites/upgrade/hammer/older/0-cluster/start.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - scrub
-    - scrub mismatch
-    - ScrubResult
-    - failed to encode
-    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
-- - client.1

diff --git a/suites/upgrade/hammer/older/1-install/latest_giant_release.yaml b/suites/upgrade/hammer/older/1-install/latest_giant_release.yaml
deleted file mode 100644 (file)
index 7bad9da..0000000
--- a/suites/upgrade/hammer/older/1-install/latest_giant_release.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-tasks:
-- install:
-    branch: giant
-- print: "**** done latest giant install"
-- ceph:
-   fs: xfs
-- parallel:
-   - workload
-   - upgrade-sequence
-- print: "**** done parallel giant"

diff --git a/suites/upgrade/hammer/older/1-install/v0.94.1.yaml b/suites/upgrade/hammer/older/1-install/v0.94.1.yaml
deleted file mode 100644 (file)
index f2578e3..0000000
--- a/suites/upgrade/hammer/older/1-install/v0.94.1.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-tasks:
-- install:
-    tag: v0.94.1
-- print: "**** done v0.94.1 install"
-- ceph:
-   fs: xfs
-- parallel:
-   - workload
-   - upgrade-sequence
-- print: "**** done parallel v0.94.1"

diff --git a/suites/upgrade/hammer/older/1-install/v0.94.yaml b/suites/upgrade/hammer/older/1-install/v0.94.yaml
deleted file mode 100644 (file)
index 7cab6c3..0000000
--- a/suites/upgrade/hammer/older/1-install/v0.94.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-tasks:
-- install:
-    tag: v0.94
-- print: "**** done v0.94 install"
-- ceph:
-   fs: xfs
-- parallel:
-   - workload
-   - upgrade-sequence
-- print: "**** done parallel v0.94"

diff --git a/suites/upgrade/hammer/older/2-workload/blogbench.yaml b/suites/upgrade/hammer/older/2-workload/blogbench.yaml
deleted file mode 100644 (file)
index e3d652e..0000000
--- a/suites/upgrade/hammer/older/2-workload/blogbench.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-workload:
-  sequential:
-  - workunit:
-      clients:
-         client.0:
-          - suites/blogbench.sh
-  - print: "**** done suites/blogbench.sh 2-workload"

diff --git a/suites/upgrade/hammer/older/2-workload/rbd.yaml b/suites/upgrade/hammer/older/2-workload/rbd.yaml
deleted file mode 100644 (file)
index d37b294..0000000
--- a/suites/upgrade/hammer/older/2-workload/rbd.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-workload:
-   sequential:
-   - workunit:
-       clients:
-         client.1:
-           - rbd/import_export.sh
-       env:
-         RBD_CREATE_ARGS: --new-format
-   - print: "**** done rbd/import_export.sh 2-workload"

diff --git a/suites/upgrade/hammer/older/2-workload/testrados.yaml b/suites/upgrade/hammer/older/2-workload/testrados.yaml
deleted file mode 100644 (file)
index 49339ec..0000000
--- a/suites/upgrade/hammer/older/2-workload/testrados.yaml
+++ /dev/null
@@ -1,12 +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/hammer/older/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/hammer/older/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
deleted file mode 100644 (file)
index f0c62fd..0000000
--- a/suites/upgrade/hammer/older/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-       mon.a:
-       mon.b:
-   - print: "**** done install.upgrade hammer"
-   - 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
-   - print: "**** done ceph.restart all"

diff --git a/suites/upgrade/hammer/older/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/hammer/older/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
deleted file mode 100644 (file)
index e4df6c8..0000000
--- a/suites/upgrade/hammer/older/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-       mon.a:
-       mon.b:
-   - print: "**** done install.upgrade hammer"
-   - 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
-   - print: "**** done ceph.restart all"

diff --git a/suites/upgrade/hammer/older/4-final/+ b/suites/upgrade/hammer/older/4-final/+
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/hammer/older/4-final/monthrash.yaml b/suites/upgrade/hammer/older/4-final/monthrash.yaml
deleted file mode 100644 (file)
index 3774702..0000000
--- a/suites/upgrade/hammer/older/4-final/monthrash.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-tasks:
-- mon_thrash:
-    revive_delay: 20
-    thrash_delay: 1
-- print: "**** done mon_thrash 4-workload"
-- ceph-fuse:
-- print: "**** done ceph-fuse 4-workload"
-- workunit:
-    clients:
-      client.0:
-        - suites/dbench.sh
-- print: "**** done suites/dbench.sh 4-workload"
-

diff --git a/suites/upgrade/hammer/older/4-final/osdthrash.yaml b/suites/upgrade/hammer/older/4-final/osdthrash.yaml
deleted file mode 100644 (file)
index b4740ad..0000000
--- a/suites/upgrade/hammer/older/4-final/osdthrash.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - wrongly marked me down
-    - objects unfound and apparently lost
-    - log bound mismatch
-    - failed to encode
-tasks:
-- sequential:
-  - thrashosds:
-      timeout: 1200
-      chance_pgnum_grow: 1
-      chance_pgpnum_fix: 1
-  - print: "**** done thrashosds 4-workload"
-  - workunit:
-      clients:
-        client.0:
-           - suites/iogen.sh
-  - print: "**** done suites/iogen.sh 4-workload"
-

diff --git a/suites/upgrade/hammer/older/4-final/testrados.yaml b/suites/upgrade/hammer/older/4-final/testrados.yaml
deleted file mode 100644 (file)
index 7186520..0000000
--- a/suites/upgrade/hammer/older/4-final/testrados.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-tasks:
-- sequential:
-  - 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/hammer/older/distros b/suites/upgrade/hammer/older/distros
deleted file mode 120000 (symlink)
index ca99fee..0000000
--- a/suites/upgrade/hammer/older/distros
+++ /dev/null
@@ -1 +0,0 @@
-../../../../distros/supported/
\ No newline at end of file

diff --git a/suites/upgrade/hammer/point-to-point/% b/suites/upgrade/hammer/point-to-point/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/hammer/point-to-point/point-to-point.yaml b/suites/upgrade/hammer/point-to-point/point-to-point.yaml
deleted file mode 100644 (file)
index 8b2d7f1..0000000
--- a/suites/upgrade/hammer/point-to-point/point-to-point.yaml
+++ /dev/null
@@ -1,164 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - reached quota
-    - scrub
-    - osd_map_max_advance
-    - failed to encode
-    fs: xfs
-    conf:
-      mon:
-        mon debug unsafe allow tier with nonempty snaps: true
-      osd:
-        osd map max advance: 1000
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-  - osd.2
-- - mon.b
-  - mon.c
-  - osd.3
-  - osd.4
-  - osd.5
-  - client.0
-- - client.1
-tasks:
-- print: "****  v0.94 about to install"
-- install:
-    tag: v0.94
-- print: "**** done v0.94 install"
-- ceph:
-   fs: xfs
-- print: "**** done ceph xfs"
-- sequential:
-   - workload
-- print: "**** done workload v0.94"
-
-- parallel:
-   - workload1
-   - upgrade-sequence1
-- print: "**** done parallel v0.94.2"
-
-- parallel:
-   - workload_hammer
-   - upgrade-sequence_hammer
-- print: "**** done parallel hammer branch"
-#######################
-workload:
-   sequential:
-   - workunit:
-       clients:
-         client.0:
-           - suites/blogbench.sh
-   - print: "**** done suites/blogbench.sh workload"
-workload1:
-   sequential:
-   - workunit:
-       clients:
-         client.0:
-         - rados/load-gen-big.sh
-   - print: "**** done rados/load-gen-big.sh workload1"
-   - workunit:
-       clients:
-         client.0:
-         - rados/test.sh
-         - cls
-   - print: "**** done rados/test.sh &  cls workload1"
-   - workunit:
-       clients:
-         client.0:
-         - rbd/test_librbd.sh
-   - print: "**** done rbd/test_librbd.sh workload1"
-upgrade-sequence1:
-   sequential:
-   - install.upgrade:
-       mon.a:
-         tag: v0.94.2
-       mon.b:
-         tag: v0.94.2
-       client.1:
-         tag: v0.94.2
-   - print: "**** done v0.94.2 install.upgrade"
-   - 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
-   - print: "**** done ceph.restart all mon/mds/osd v0.94.2"
-workload_hammer:
-   sequential:
-   - rgw: [client.0]
-   - print: "**** done rgw workload_hammer"
-   - s3tests:
-       client.0:
-         force-branch: hammer
-         rgw_server: client.0
-   - print: "**** done s3tests workload_hammer"
-upgrade-sequence_hammer:
-   sequential:
-   - install.upgrade:
-       mon.a:
-         branch: hammer
-       mon.b:
-         branch: hammer
-       client.1:
-         branch: hammer
-   - print: "**** done branch: hammer install.upgrade"
-   - 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: 60
-   - ceph.restart: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - print: "**** done ceph.restart all hammer current branch mds/osd/mon"

diff --git a/suites/upgrade/hammer/point-to-point/ubuntu_14.04.yaml b/suites/upgrade/hammer/point-to-point/ubuntu_14.04.yaml
deleted file mode 120000 (symlink)
index 67b68b7..0000000
--- a/suites/upgrade/hammer/point-to-point/ubuntu_14.04.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../distros/supported/ubuntu_14.04.yaml
\ No newline at end of file

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

diff --git a/suites/upgrade/infernalis/older/0-cluster/start.yaml b/suites/upgrade/infernalis/older/0-cluster/start.yaml
deleted file mode 100644 (file)
index 8cef1be..0000000
--- a/suites/upgrade/infernalis/older/0-cluster/start.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-meta:
-- desc: |
-   Run ceph on two nodes, using one of them as a client,
-   with a separate client-only node. 
-   Use xfs beneath the osds.
-overrides:
-  ceph:
-    log-whitelist:
-    - scrub
-    - scrub mismatch
-    - ScrubResult
-    - wrongly marked me down
-    - objects unfound and apparently lost
-    - log bound mismatch
-    - soft lockup
-    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
-- - client.1

diff --git a/suites/upgrade/infernalis/older/1-install/latest_infernalis_release.yaml b/suites/upgrade/infernalis/older/1-install/latest_infernalis_release.yaml
deleted file mode 100644 (file)
index dc42d42..0000000
--- a/suites/upgrade/infernalis/older/1-install/latest_infernalis_release.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-meta:
-- desc: |
-   install ceph/infernalis
-   run workload and upgrade-sequence in parallel
-tasks:
-- install:
-    branch: infernalis
-- print: "**** done latest infernalis install"
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence
-- print: "**** done parallel infernalis"

diff --git a/suites/upgrade/infernalis/older/1-install/v9.1.0.yaml b/suites/upgrade/infernalis/older/1-install/v9.1.0.yaml
deleted file mode 100644 (file)
index 3f345ce..0000000
--- a/suites/upgrade/infernalis/older/1-install/v9.1.0.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-meta:
-- desc: |
-   install ceph/infernalis v9.1.0
-   run workload and upgrade-sequence in parallel
-tasks:
-- install:
-    tag: v9.1.0
-- print: "**** done v9.1.0 install"
-- ceph:
-- parallel:
-   - workload
-   - upgrade-sequence
-- print: "**** done parallel v9.1.0"

diff --git a/suites/upgrade/infernalis/older/2-workload/blogbench.yaml b/suites/upgrade/infernalis/older/2-workload/blogbench.yaml
deleted file mode 100644 (file)
index 290eab5..0000000
--- a/suites/upgrade/infernalis/older/2-workload/blogbench.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-meta:
-- desc: |
-   run a cephfs stress test
-   mount ceph-fuse on client.0 before running workunit
-workload:
-  sequential:
-  - ceph-fuse:
-  - print: "**** done ceph-fuse 2-workload"
-  - workunit:
-      clients:
-         client.0:
-          - suites/blogbench.sh
-  - print: "**** done suites/blogbench.sh 2-workload"

diff --git a/suites/upgrade/infernalis/older/2-workload/rbd.yaml b/suites/upgrade/infernalis/older/2-workload/rbd.yaml
deleted file mode 100644 (file)
index 95a1f99..0000000
--- a/suites/upgrade/infernalis/older/2-workload/rbd.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-meta:
-- desc: |
-   run basic import/export cli tests for rbd
-workload:
-   sequential:
-   - workunit:
-       clients:
-         client.1:
-           - rbd/import_export.sh
-       env:
-         RBD_CREATE_ARGS: --new-format
-   - print: "**** done rbd/import_export.sh 2-workload"

diff --git a/suites/upgrade/infernalis/older/2-workload/testrados.yaml b/suites/upgrade/infernalis/older/2-workload/testrados.yaml
deleted file mode 100644 (file)
index 286ff7d..0000000
--- a/suites/upgrade/infernalis/older/2-workload/testrados.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-meta:
-- desc: |
-   run randomized correctness test for rados operations
-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/infernalis/older/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/infernalis/older/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
deleted file mode 100644 (file)
index ae582b4..0000000
--- a/suites/upgrade/infernalis/older/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-meta:
-- desc: |
-   upgrade the ceph cluster, 
-   ordering: mon, mds, osd
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-       mon.a:
-       mon.b:
-   - print: "**** done install.upgrade infernalis"
-   - 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
-   - print: "**** done ceph.restart all"

diff --git a/suites/upgrade/infernalis/older/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/infernalis/older/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
deleted file mode 100644 (file)
index 54711d2..0000000
--- a/suites/upgrade/infernalis/older/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-meta:
-- desc: |
-   upgrade the ceph cluster, 
-   ordering: osd, mon, mds
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-       mon.a:
-       mon.b:
-   - print: "**** done install.upgrade infernalis"
-   - 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
-   - print: "**** done ceph.restart all"

diff --git a/suites/upgrade/infernalis/older/4-final/+ b/suites/upgrade/infernalis/older/4-final/+
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/infernalis/older/4-final/monthrash.yaml b/suites/upgrade/infernalis/older/4-final/monthrash.yaml
deleted file mode 100644 (file)
index 5d9e06e..0000000
--- a/suites/upgrade/infernalis/older/4-final/monthrash.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-meta:
-- desc: |
-   randomly kill and revive monitors
-tasks:
-- mon_thrash:
-    revive_delay: 20
-    thrash_delay: 1
-- print: "**** done mon_thrash 4-workload"
-- ceph-fuse:
-- print: "**** done ceph-fuse 4-workload"
-- workunit:
-    clients:
-      client.0:
-        - suites/dbench.sh
-- print: "**** done suites/dbench.sh 4-workload"
-

diff --git a/suites/upgrade/infernalis/older/4-final/osdthrash.yaml b/suites/upgrade/infernalis/older/4-final/osdthrash.yaml
deleted file mode 100644 (file)
index a2872de..0000000
--- a/suites/upgrade/infernalis/older/4-final/osdthrash.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-meta:
-- desc: |
-   randomly kill and revive osds
-   increasing the number of pgs at random times
-   run cephfs stress test
-tasks:
-- sequential:
-  - thrashosds:
-      timeout: 1200
-      chance_pgnum_grow: 1
-      chance_pgpnum_fix: 1
-  - print: "**** done thrashosds 4-workload"
-  - workunit:
-      clients:
-        client.0:
-           - suites/iogen.sh
-  - print: "**** done suites/iogen.sh 4-workload"
-

diff --git a/suites/upgrade/infernalis/older/4-final/testrados.yaml b/suites/upgrade/infernalis/older/4-final/testrados.yaml
deleted file mode 100644 (file)
index 5838109..0000000
--- a/suites/upgrade/infernalis/older/4-final/testrados.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-meta:
-- desc: |
-   run randomized correctness test for rados operations
-tasks:
-- sequential:
-  - 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/infernalis/older/distros b/suites/upgrade/infernalis/older/distros
deleted file mode 120000 (symlink)
index ca99fee..0000000
--- a/suites/upgrade/infernalis/older/distros
+++ /dev/null
@@ -1 +0,0 @@
-../../../../distros/supported/
\ No newline at end of file