Fixes #11570

Removed test_cls_rbd.sh per Josh's suggestion
Removed 'branch: hammer' from 3-upgrade-sequence/upgrade-*

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
(cherry picked from commit 52fa9a32c8dd5cf527838cd92ca8eec312ab3d41)

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

diff --git a/suites/upgrade/hammer/basic/0-cluster/start.yaml b/suites/upgrade/hammer/basic/0-cluster/start.yaml
deleted file mode 100644 (file)
index 5f2f971..0000000
--- a/suites/upgrade/hammer/basic/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/hammer/basic/1-install/latest_giant_release.yaml b/suites/upgrade/hammer/basic/1-install/latest_giant_release.yaml
deleted file mode 100644 (file)
index 0a7b9ec..0000000
--- a/suites/upgrade/hammer/basic/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"

diff --git a/suites/upgrade/hammer/basic/2-workload/blogbench.yaml b/suites/upgrade/hammer/basic/2-workload/blogbench.yaml
deleted file mode 100644 (file)
index e3d652e..0000000
--- a/suites/upgrade/hammer/basic/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/basic/2-workload/rbd.yaml b/suites/upgrade/hammer/basic/2-workload/rbd.yaml
deleted file mode 100644 (file)
index 5960273..0000000
--- a/suites/upgrade/hammer/basic/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/basic/2-workload/s3tests.yaml b/suites/upgrade/hammer/basic/2-workload/s3tests.yaml
deleted file mode 100644 (file)
index 43f56b7..0000000
--- a/suites/upgrade/hammer/basic/2-workload/s3tests.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-workload:
-  sequential:
-  - rgw: [client.0]
-  - print: "**** done rgw: [client.0] 2-workload"
-  - s3tests:
-      client.0:
-        force-branch: firefly-original
-        rgw_server: client.0
-  - print: "**** done s3tests 2-workload"

diff --git a/suites/upgrade/hammer/basic/2-workload/testrados.yaml b/suites/upgrade/hammer/basic/2-workload/testrados.yaml
deleted file mode 100644 (file)
index 49339ec..0000000
--- a/suites/upgrade/hammer/basic/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/basic/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/hammer/basic/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
deleted file mode 100644 (file)
index fe55b51..0000000
--- a/suites/upgrade/hammer/basic/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: hammer
-   - 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/basic/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/hammer/basic/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
deleted file mode 100644 (file)
index 2835df0..0000000
--- a/suites/upgrade/hammer/basic/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-      all:
-         branch: hammer
-   - 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/basic/4-final/+ b/suites/upgrade/hammer/basic/4-final/+
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/hammer/basic/4-final/monthrash.yaml b/suites/upgrade/hammer/basic/4-final/monthrash.yaml
deleted file mode 100644 (file)
index 3774702..0000000
--- a/suites/upgrade/hammer/basic/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/basic/4-final/osdthrash.yaml b/suites/upgrade/hammer/basic/4-final/osdthrash.yaml
deleted file mode 100644 (file)
index b5acf43..0000000
--- a/suites/upgrade/hammer/basic/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 4-workload"
-  - workunit:
-      clients:
-        client.0:
-           - suites/iogen.sh
-  - print: "**** done suites/iogen.sh 4-workload"
-

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

diff --git a/suites/upgrade/hammer/basic/distros b/suites/upgrade/hammer/basic/distros
deleted file mode 120000 (symlink)
index ca99fee..0000000
--- a/suites/upgrade/hammer/basic/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/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/upgrade/hammer/newer/0-cluster/start.yaml b/suites/upgrade/hammer/newer/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..5f2f971
--- /dev/null
+++ b/suites/upgrade/hammer/newer/0-cluster/start.yaml
@@ -0,0 +1,20 @@
+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/hammer/newer/1-install/v0.94.2.yaml b/suites/upgrade/hammer/newer/1-install/v0.94.2.yaml
new file mode 100644 (file)
index 0000000..c380658
--- /dev/null
+++ b/suites/upgrade/hammer/newer/1-install/v0.94.2.yaml
@@ -0,0 +1,10 @@
+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
new file mode 100644 (file)
index 0000000..e3d652e
--- /dev/null
+++ b/suites/upgrade/hammer/newer/2-workload/blogbench.yaml
@@ -0,0 +1,7 @@
+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
new file mode 100644 (file)
index 0000000..5960273
--- /dev/null
+++ b/suites/upgrade/hammer/newer/2-workload/rbd.yaml
@@ -0,0 +1,9 @@
+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
new file mode 100644 (file)
index 0000000..43f56b7
--- /dev/null
+++ b/suites/upgrade/hammer/newer/2-workload/s3tests.yaml
@@ -0,0 +1,9 @@
+workload:
+  sequential:
+  - rgw: [client.0]
+  - print: "**** done rgw: [client.0] 2-workload"
+  - s3tests:
+      client.0:
+        force-branch: firefly-original
+        rgw_server: client.0
+  - 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
new file mode 100644 (file)
index 0000000..49339ec
--- /dev/null
+++ b/suites/upgrade/hammer/newer/2-workload/testrados.yaml
@@ -0,0 +1,12 @@
+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
new file mode 100644 (file)
index 0000000..b697e2c
--- /dev/null
+++ b/suites/upgrade/hammer/newer/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -0,0 +1,36 @@
+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
new file mode 100644 (file)
index 0000000..0f773e4
--- /dev/null
+++ b/suites/upgrade/hammer/newer/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
@@ -0,0 +1,36 @@
+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/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/upgrade/hammer/newer/4-final/monthrash.yaml b/suites/upgrade/hammer/newer/4-final/monthrash.yaml
new file mode 100644 (file)
index 0000000..3774702
--- /dev/null
+++ b/suites/upgrade/hammer/newer/4-final/monthrash.yaml
@@ -0,0 +1,13 @@
+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
new file mode 100644 (file)
index 0000000..b5acf43
--- /dev/null
+++ b/suites/upgrade/hammer/newer/4-final/osdthrash.yaml
@@ -0,0 +1,19 @@
+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 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
new file mode 100644 (file)
index 0000000..7b2c2c3
--- /dev/null
+++ b/suites/upgrade/hammer/newer/4-final/testrgw.yaml
@@ -0,0 +1,8 @@
+tasks:
+- sequential:
+  - rgw: [client.1]
+  - print: "**** done rgw: [client.1] 4-workload"
+  - s3tests:
+      client.1:
+         rgw_server: client.1
+  - print: "**** done s3tests 4-workload"

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

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

diff --git a/suites/upgrade/hammer/older/0-cluster/start.yaml b/suites/upgrade/hammer/older/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..5f2f971
--- /dev/null
+++ b/suites/upgrade/hammer/older/0-cluster/start.yaml
@@ -0,0 +1,20 @@
+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/hammer/older/1-install/latest_giant_release.yaml b/suites/upgrade/hammer/older/1-install/latest_giant_release.yaml
new file mode 100644 (file)
index 0000000..7bad9da
--- /dev/null
+++ b/suites/upgrade/hammer/older/1-install/latest_giant_release.yaml
@@ -0,0 +1,10 @@
+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
new file mode 100644 (file)
index 0000000..f2578e3
--- /dev/null
+++ b/suites/upgrade/hammer/older/1-install/v0.94.1.yaml
@@ -0,0 +1,10 @@
+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
new file mode 100644 (file)
index 0000000..7cab6c3
--- /dev/null
+++ b/suites/upgrade/hammer/older/1-install/v0.94.yaml
@@ -0,0 +1,10 @@
+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
new file mode 100644 (file)
index 0000000..e3d652e
--- /dev/null
+++ b/suites/upgrade/hammer/older/2-workload/blogbench.yaml
@@ -0,0 +1,7 @@
+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
new file mode 100644 (file)
index 0000000..5960273
--- /dev/null
+++ b/suites/upgrade/hammer/older/2-workload/rbd.yaml
@@ -0,0 +1,9 @@
+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/older/2-workload/testrados.yaml b/suites/upgrade/hammer/older/2-workload/testrados.yaml
new file mode 100644 (file)
index 0000000..49339ec
--- /dev/null
+++ b/suites/upgrade/hammer/older/2-workload/testrados.yaml
@@ -0,0 +1,12 @@
+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
new file mode 100644 (file)
index 0000000..b697e2c
--- /dev/null
+++ b/suites/upgrade/hammer/older/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -0,0 +1,36 @@
+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/older/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/hammer/older/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
new file mode 100644 (file)
index 0000000..0f773e4
--- /dev/null
+++ b/suites/upgrade/hammer/older/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
@@ -0,0 +1,36 @@
+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/older/4-final/+ b/suites/upgrade/hammer/older/4-final/+
new file mode 100644 (file)
index 0000000..e69de29

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