Initial check in for upgrades/hammer stable upgrade suite

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

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

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

diff --git a/suites/upgrade/hammer/2-workload/blogbench.yaml b/suites/upgrade/hammer/2-workload/blogbench.yaml
new file mode 100644 (file)
index 0000000..e3d652e
--- /dev/null
+++ b/suites/upgrade/hammer/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/2-workload/rbd.yaml b/suites/upgrade/hammer/2-workload/rbd.yaml
new file mode 100644 (file)
index 0000000..45fc835
--- /dev/null
+++ b/suites/upgrade/hammer/2-workload/rbd.yaml
@@ -0,0 +1,14 @@
+workload:
+   sequential:
+   - workunit:
+       clients:
+         client.0:
+           - rbd/import_export.sh
+       env:
+         RBD_CREATE_ARGS: --new-format
+   - print: "**** done rbd/import_export.sh 2-workload"
+   - workunit:
+       clients:
+         client.0:
+           - cls/test_cls_rbd.sh
+   - print: "**** done cls/test_cls_rbd.sh 2-workload"

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

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