Added upgrade tests - stable

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

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

diff --git a/suites/upgrade/firefly/fs/0-cluster/start.yaml b/suites/upgrade/firefly/fs/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..c1acc4e
--- /dev/null
+++ b/suites/upgrade/firefly/fs/0-cluster/start.yaml
@@ -0,0 +1,17 @@
+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/firefly/fs/1-install/dumpling.v0.80.1.yaml b/suites/upgrade/firefly/fs/1-install/dumpling.v0.80.1.yaml
new file mode 100644 (file)
index 0000000..29cf50c
--- /dev/null
+++ b/suites/upgrade/firefly/fs/1-install/dumpling.v0.80.1.yaml
@@ -0,0 +1,11 @@
+tasks:
+- install:
+    branch: dumpling
+- ceph:
+- install.upgrade:
+    all:
+      tag: v0.80.1
+- ceph.restart:
+- parallel:
+   - workload
+   - upgrade-sequence

diff --git a/suites/upgrade/firefly/fs/1-install/emperor.v.80.1.yaml b/suites/upgrade/firefly/fs/1-install/emperor.v.80.1.yaml
new file mode 100644 (file)
index 0000000..d125e1d
--- /dev/null
+++ b/suites/upgrade/firefly/fs/1-install/emperor.v.80.1.yaml
@@ -0,0 +1,11 @@
+tasks:
+- install:
+    branch: emperor
+- ceph:
+- install.upgrade:
+    all:
+      tag: v0.80.1
+- ceph.restart:
+- parallel:
+   - workload
+   - upgrade-sequence

diff --git a/suites/upgrade/firefly/fs/1-install/v0.80.1.yaml b/suites/upgrade/firefly/fs/1-install/v0.80.1.yaml
new file mode 100644 (file)
index 0000000..4f95848
--- /dev/null
+++ b/suites/upgrade/firefly/fs/1-install/v0.80.1.yaml
@@ -0,0 +1,7 @@
+tasks:
+- install:
+    tag: v0.80.1
+- ceph:
+- parallel:
+   - workload
+   - upgrade-sequence

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

diff --git a/suites/upgrade/firefly/fs/1-install/v0.80.yaml b/suites/upgrade/firefly/fs/1-install/v0.80.yaml
new file mode 100644 (file)
index 0000000..30ad439
--- /dev/null
+++ b/suites/upgrade/firefly/fs/1-install/v0.80.yaml
@@ -0,0 +1,7 @@
+tasks:
+- install:
+    tag: v0.80
+- ceph:
+- parallel:
+   - workload
+   - upgrade-sequence

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

diff --git a/suites/upgrade/firefly/fs/3-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade/firefly/fs/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
new file mode 100644 (file)
index 0000000..38bba91
--- /dev/null
+++ b/suites/upgrade/firefly/fs/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
@@ -0,0 +1,33 @@
+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/firefly/fs/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/firefly/fs/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
new file mode 100644 (file)
index 0000000..5b617fd
--- /dev/null
+++ b/suites/upgrade/firefly/fs/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -0,0 +1,33 @@
+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/firefly/fs/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/firefly/fs/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
new file mode 100644 (file)
index 0000000..91c146a
--- /dev/null
+++ b/suites/upgrade/firefly/fs/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
@@ -0,0 +1,33 @@
+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/firefly/fs/4-final/monthrash.yaml b/suites/upgrade/firefly/fs/4-final/monthrash.yaml
new file mode 100644 (file)
index 0000000..e03cff6
--- /dev/null
+++ b/suites/upgrade/firefly/fs/4-final/monthrash.yaml
@@ -0,0 +1,9 @@
+tasks:
+- mon_thrash:
+    revive_delay: 20
+    thrash_delay: 1
+- ceph-fuse:
+- workunit:
+    clients:
+      client.0:
+        - suites/dbench.sh

diff --git a/suites/upgrade/firefly/fs/4-final/osdthrash.yaml b/suites/upgrade/firefly/fs/4-final/osdthrash.yaml
new file mode 100644 (file)
index 0000000..f7d74b2
--- /dev/null
+++ b/suites/upgrade/firefly/fs/4-final/osdthrash.yaml
@@ -0,0 +1,16 @@
+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/firefly/rados/% b/suites/upgrade/firefly/rados/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/upgrade/firefly/rados/0-cluster/start.yaml b/suites/upgrade/firefly/rados/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..c1acc4e
--- /dev/null
+++ b/suites/upgrade/firefly/rados/0-cluster/start.yaml
@@ -0,0 +1,17 @@
+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/firefly/rados/1-install/dumpling.v0.80.1.yaml b/suites/upgrade/firefly/rados/1-install/dumpling.v0.80.1.yaml
new file mode 100644 (file)
index 0000000..29cf50c
--- /dev/null
+++ b/suites/upgrade/firefly/rados/1-install/dumpling.v0.80.1.yaml
@@ -0,0 +1,11 @@
+tasks:
+- install:
+    branch: dumpling
+- ceph:
+- install.upgrade:
+    all:
+      tag: v0.80.1
+- ceph.restart:
+- parallel:
+   - workload
+   - upgrade-sequence

diff --git a/suites/upgrade/firefly/rados/1-install/emperor.v.80.1.yaml b/suites/upgrade/firefly/rados/1-install/emperor.v.80.1.yaml
new file mode 100644 (file)
index 0000000..d125e1d
--- /dev/null
+++ b/suites/upgrade/firefly/rados/1-install/emperor.v.80.1.yaml
@@ -0,0 +1,11 @@
+tasks:
+- install:
+    branch: emperor
+- ceph:
+- install.upgrade:
+    all:
+      tag: v0.80.1
+- ceph.restart:
+- parallel:
+   - workload
+   - upgrade-sequence

diff --git a/suites/upgrade/firefly/rados/1-install/v0.80.1.yaml b/suites/upgrade/firefly/rados/1-install/v0.80.1.yaml
new file mode 100644 (file)
index 0000000..4f95848
--- /dev/null
+++ b/suites/upgrade/firefly/rados/1-install/v0.80.1.yaml
@@ -0,0 +1,7 @@
+tasks:
+- install:
+    tag: v0.80.1
+- ceph:
+- parallel:
+   - workload
+   - upgrade-sequence

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

diff --git a/suites/upgrade/firefly/rados/1-install/v0.80.yaml b/suites/upgrade/firefly/rados/1-install/v0.80.yaml
new file mode 100644 (file)
index 0000000..30ad439
--- /dev/null
+++ b/suites/upgrade/firefly/rados/1-install/v0.80.yaml
@@ -0,0 +1,7 @@
+tasks:
+- install:
+    tag: v0.80
+- ceph:
+- parallel:
+   - workload
+   - upgrade-sequence

diff --git a/suites/upgrade/firefly/rados/2-workload/testrados.yaml b/suites/upgrade/firefly/rados/2-workload/testrados.yaml
new file mode 100644 (file)
index 0000000..49339ec
--- /dev/null
+++ b/suites/upgrade/firefly/rados/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/firefly/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade/firefly/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
new file mode 100644 (file)
index 0000000..38bba91
--- /dev/null
+++ b/suites/upgrade/firefly/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
@@ -0,0 +1,33 @@
+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/firefly/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/firefly/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
new file mode 100644 (file)
index 0000000..5b617fd
--- /dev/null
+++ b/suites/upgrade/firefly/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -0,0 +1,33 @@
+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/firefly/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/firefly/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
new file mode 100644 (file)
index 0000000..801bab9
--- /dev/null
+++ b/suites/upgrade/firefly/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
@@ -0,0 +1,35 @@
+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/firefly/rados/4-final/monthrash.yaml b/suites/upgrade/firefly/rados/4-final/monthrash.yaml
new file mode 100644 (file)
index 0000000..0908385
--- /dev/null
+++ b/suites/upgrade/firefly/rados/4-final/monthrash.yaml
@@ -0,0 +1,8 @@
+tasks:
+- mon_thrash:
+    revive_delay: 20
+    thrash_delay: 1
+- workunit:
+    clients:
+      client.0:
+        - rados/test.sh

diff --git a/suites/upgrade/firefly/rados/4-final/osdthrash.yaml b/suites/upgrade/firefly/rados/4-final/osdthrash.yaml
new file mode 100644 (file)
index 0000000..4ec6d1b
--- /dev/null
+++ b/suites/upgrade/firefly/rados/4-final/osdthrash.yaml
@@ -0,0 +1,22 @@
+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/firefly/rbd/% b/suites/upgrade/firefly/rbd/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/upgrade/firefly/rbd/0-cluster/start.yaml b/suites/upgrade/firefly/rbd/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..c1acc4e
--- /dev/null
+++ b/suites/upgrade/firefly/rbd/0-cluster/start.yaml
@@ -0,0 +1,17 @@
+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/firefly/rbd/1-install/dumpling.v0.80.1.yaml b/suites/upgrade/firefly/rbd/1-install/dumpling.v0.80.1.yaml
new file mode 100644 (file)
index 0000000..29cf50c
--- /dev/null
+++ b/suites/upgrade/firefly/rbd/1-install/dumpling.v0.80.1.yaml
@@ -0,0 +1,11 @@
+tasks:
+- install:
+    branch: dumpling
+- ceph:
+- install.upgrade:
+    all:
+      tag: v0.80.1
+- ceph.restart:
+- parallel:
+   - workload
+   - upgrade-sequence

diff --git a/suites/upgrade/firefly/rbd/1-install/emperor.v.80.1.yaml b/suites/upgrade/firefly/rbd/1-install/emperor.v.80.1.yaml
new file mode 100644 (file)
index 0000000..d125e1d
--- /dev/null
+++ b/suites/upgrade/firefly/rbd/1-install/emperor.v.80.1.yaml
@@ -0,0 +1,11 @@
+tasks:
+- install:
+    branch: emperor
+- ceph:
+- install.upgrade:
+    all:
+      tag: v0.80.1
+- ceph.restart:
+- parallel:
+   - workload
+   - upgrade-sequence

diff --git a/suites/upgrade/firefly/rbd/1-install/v0.80.1.yaml b/suites/upgrade/firefly/rbd/1-install/v0.80.1.yaml
new file mode 100644 (file)
index 0000000..4f95848
--- /dev/null
+++ b/suites/upgrade/firefly/rbd/1-install/v0.80.1.yaml
@@ -0,0 +1,7 @@
+tasks:
+- install:
+    tag: v0.80.1
+- ceph:
+- parallel:
+   - workload
+   - upgrade-sequence

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

diff --git a/suites/upgrade/firefly/rbd/1-install/v0.80.yaml b/suites/upgrade/firefly/rbd/1-install/v0.80.yaml
new file mode 100644 (file)
index 0000000..30ad439
--- /dev/null
+++ b/suites/upgrade/firefly/rbd/1-install/v0.80.yaml
@@ -0,0 +1,7 @@
+tasks:
+- install:
+    tag: v0.80
+- ceph:
+- parallel:
+   - workload
+   - upgrade-sequence

diff --git a/suites/upgrade/firefly/rbd/2-workload/rbd.yaml b/suites/upgrade/firefly/rbd/2-workload/rbd.yaml
new file mode 100644 (file)
index 0000000..698e5e9
--- /dev/null
+++ b/suites/upgrade/firefly/rbd/2-workload/rbd.yaml
@@ -0,0 +1,12 @@
+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/firefly/rbd/3-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade/firefly/rbd/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
new file mode 100644 (file)
index 0000000..38bba91
--- /dev/null
+++ b/suites/upgrade/firefly/rbd/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
@@ -0,0 +1,33 @@
+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/firefly/rbd/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/firefly/rbd/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
new file mode 100644 (file)
index 0000000..5b617fd
--- /dev/null
+++ b/suites/upgrade/firefly/rbd/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -0,0 +1,33 @@
+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/firefly/rbd/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/firefly/rbd/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
new file mode 100644 (file)
index 0000000..91c146a
--- /dev/null
+++ b/suites/upgrade/firefly/rbd/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
@@ -0,0 +1,33 @@
+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/firefly/rbd/4-final/monthrash.yaml b/suites/upgrade/firefly/rbd/4-final/monthrash.yaml
new file mode 100644 (file)
index 0000000..c7dcea9
--- /dev/null
+++ b/suites/upgrade/firefly/rbd/4-final/monthrash.yaml
@@ -0,0 +1,10 @@
+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/firefly/rbd/4-final/osdthrash.yaml b/suites/upgrade/firefly/rbd/4-final/osdthrash.yaml
new file mode 100644 (file)
index 0000000..2a234fd
--- /dev/null
+++ b/suites/upgrade/firefly/rbd/4-final/osdthrash.yaml
@@ -0,0 +1,15 @@
+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/firefly/rgw/% b/suites/upgrade/firefly/rgw/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/upgrade/firefly/rgw/0-cluster/start.yaml b/suites/upgrade/firefly/rgw/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..c1acc4e
--- /dev/null
+++ b/suites/upgrade/firefly/rgw/0-cluster/start.yaml
@@ -0,0 +1,17 @@
+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/firefly/rgw/1-install/dumpling.v0.80.1.yaml b/suites/upgrade/firefly/rgw/1-install/dumpling.v0.80.1.yaml
new file mode 100644 (file)
index 0000000..29cf50c
--- /dev/null
+++ b/suites/upgrade/firefly/rgw/1-install/dumpling.v0.80.1.yaml
@@ -0,0 +1,11 @@
+tasks:
+- install:
+    branch: dumpling
+- ceph:
+- install.upgrade:
+    all:
+      tag: v0.80.1
+- ceph.restart:
+- parallel:
+   - workload
+   - upgrade-sequence

diff --git a/suites/upgrade/firefly/rgw/1-install/emperor.v.80.1.yaml b/suites/upgrade/firefly/rgw/1-install/emperor.v.80.1.yaml
new file mode 100644 (file)
index 0000000..d125e1d
--- /dev/null
+++ b/suites/upgrade/firefly/rgw/1-install/emperor.v.80.1.yaml
@@ -0,0 +1,11 @@
+tasks:
+- install:
+    branch: emperor
+- ceph:
+- install.upgrade:
+    all:
+      tag: v0.80.1
+- ceph.restart:
+- parallel:
+   - workload
+   - upgrade-sequence

diff --git a/suites/upgrade/firefly/rgw/1-install/v0.80.1.yaml b/suites/upgrade/firefly/rgw/1-install/v0.80.1.yaml
new file mode 100644 (file)
index 0000000..4f95848
--- /dev/null
+++ b/suites/upgrade/firefly/rgw/1-install/v0.80.1.yaml
@@ -0,0 +1,7 @@
+tasks:
+- install:
+    tag: v0.80.1
+- ceph:
+- parallel:
+   - workload
+   - upgrade-sequence

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

diff --git a/suites/upgrade/firefly/rgw/1-install/v0.80.yaml b/suites/upgrade/firefly/rgw/1-install/v0.80.yaml
new file mode 100644 (file)
index 0000000..30ad439
--- /dev/null
+++ b/suites/upgrade/firefly/rgw/1-install/v0.80.yaml
@@ -0,0 +1,7 @@
+tasks:
+- install:
+    tag: v0.80
+- ceph:
+- parallel:
+   - workload
+   - upgrade-sequence

diff --git a/suites/upgrade/firefly/rgw/2-workload/testrgw.yaml b/suites/upgrade/firefly/rgw/2-workload/testrgw.yaml
new file mode 100644 (file)
index 0000000..b559eaa
--- /dev/null
+++ b/suites/upgrade/firefly/rgw/2-workload/testrgw.yaml
@@ -0,0 +1,6 @@
+workload:
+  sequential:
+  - rgw: [client.0]
+  - s3tests:
+      client.0:
+         rgw_server: client.0

diff --git a/suites/upgrade/firefly/rgw/3-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade/firefly/rgw/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
new file mode 100644 (file)
index 0000000..ff91290
--- /dev/null
+++ b/suites/upgrade/firefly/rgw/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
@@ -0,0 +1,36 @@
+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/firefly/rgw/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/firefly/rgw/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
new file mode 100644 (file)
index 0000000..75face2
--- /dev/null
+++ b/suites/upgrade/firefly/rgw/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -0,0 +1,36 @@
+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/firefly/rgw/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/firefly/rgw/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
new file mode 100644 (file)
index 0000000..a08c669
--- /dev/null
+++ b/suites/upgrade/firefly/rgw/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
@@ -0,0 +1,36 @@
+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/firefly/rgw/4-final/monthrash.yaml b/suites/upgrade/firefly/rgw/4-final/monthrash.yaml
new file mode 100644 (file)
index 0000000..065ef2d
--- /dev/null
+++ b/suites/upgrade/firefly/rgw/4-final/monthrash.yaml
@@ -0,0 +1,7 @@
+tasks:
+- mon_thrash:
+    revive_delay: 20
+    thrash_delay: 1
+- swift:
+    client.0:
+      rgw_server: client.0

diff --git a/suites/upgrade/firefly/rgw/4-final/osdthrash.yaml b/suites/upgrade/firefly/rgw/4-final/osdthrash.yaml
new file mode 100644 (file)
index 0000000..ac4479a
--- /dev/null
+++ b/suites/upgrade/firefly/rgw/4-final/osdthrash.yaml
@@ -0,0 +1,14 @@
+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