Cleaned up tests structure

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

diff --git a/suites/upgrade/firefly/singleton/all-x/upgrade_client/% b/suites/upgrade/firefly/singleton/all-x/upgrade_client/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/firefly/singleton/all-x/upgrade_client/distros b/suites/upgrade/firefly/singleton/all-x/upgrade_client/distros
deleted file mode 120000 (symlink)
index 7b52e04..0000000
--- a/suites/upgrade/firefly/singleton/all-x/upgrade_client/distros
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../distros/supported/
\ No newline at end of file

diff --git a/suites/upgrade/firefly/singleton/all-x/upgrade_client/upgrade_client_first.yaml b/suites/upgrade/firefly/singleton/all-x/upgrade_client/upgrade_client_first.yaml
deleted file mode 100644 (file)
index 1d8e2ca..0000000
--- a/suites/upgrade/firefly/singleton/all-x/upgrade_client/upgrade_client_first.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-# this case tests issue #9419 "dumpling->firefly upgrade, sending setallochint?"
-overrides:
-  ceph:
-    conf:
-      mon:
-        mon warn on legacy crush tunables: false
-    log-whitelist:
-      - scrub mismatch
-      - ScrubResult
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-- - client.0
-tasks:
-- install:
-   branch: dumpling
-- print: "**** done install dumpling" 
-- ceph:
-   fs: xfs
-- print: "**** done ceph"
-- install.upgrade:
-    client.0:
-- print: "**** done install.upgrade on clinet.0" 
-- install.upgrade:
-    mon.a:
-    mon.b:
-- print: "**** done install.upgrade" 
-- ceph.restart: 
-    daemons: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1]
-- print: "**** done restart all" 
-- workunit:
-    branch: firefly
-    clients:
-      client.0:
-      - rbd/test_librbd_python.sh
-- print: "**** done rbd/test_librbd_python.sh"
-- workunit:
-    branch: firefly
-    clients:
-      client.0:
-      - rados/test.sh
-      - cls
-- print: "**** done rados/test.sh &  cls" 
-- workunit:
-    branch: firefly
-    clients:
-      client.0:
-        - rbd/import_export.sh
-    env:
-      RBD_CREATE_ARGS: --new-format
-- print: "**** done rbd/import_export.sh"
-- workunit:
-    branch: firefly
-    clients:
-      client.0:
-        - cls/test_cls_rbd.sh
-- print: "**** done cls/test_cls_rbd.sh"
-- rgw: [client.0]
-- s3tests:
-    client.0:
-      force-branch: firefly-original
-      rgw_server: client.0
-- print: "**** done s3tests"

diff --git a/suites/upgrade/firefly/singleton/all-x/versions-steps/% b/suites/upgrade/firefly/singleton/all-x/versions-steps/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/firefly/singleton/all-x/versions-steps/distros b/suites/upgrade/firefly/singleton/all-x/versions-steps/distros
deleted file mode 120000 (symlink)
index 7b52e04..0000000
--- a/suites/upgrade/firefly/singleton/all-x/versions-steps/distros
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../distros/supported/
\ No newline at end of file

diff --git a/suites/upgrade/firefly/singleton/all-x/versions-steps/versions-steps-x.yaml b/suites/upgrade/firefly/singleton/all-x/versions-steps/versions-steps-x.yaml
deleted file mode 100644 (file)
index f4a0c31..0000000
--- a/suites/upgrade/firefly/singleton/all-x/versions-steps/versions-steps-x.yaml
+++ /dev/null
@@ -1,244 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - scrub
-    fs: xfs
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-  - osd.2
-- - mon.b
-  - mon.c
-  - osd.3
-  - osd.4
-  - osd.5
-  - client.0
-- - client.1
-tasks:
-- install:
-    tag: v0.80.4
-- print: "**** done v0.80.4 install"
-- ceph:
-   fs: xfs
-- print: "**** done ceph xfs"
-- sequential:
-   - workload
-- print: "**** done workload v0.80.4"
-- parallel:
-   - workload1
-   - upgrade-sequence1
-- print: "**** done parallel v0.80.5"
-- parallel:
-   - workload2
-   - upgrade-sequence2
-- print: "**** done parallel v0.80.6"
-- parallel:
-   - workload3
-   - upgrade-sequence3
-- print: "**** done parallel firefly"
-- parallel:
-   - workload-x
-   - upgrade-sequence-x
-- print: "**** done parallel -x branch"
-#######################
-workload:
-   workunit:
-      clients:
-         client.0:
-           - suites/blogbench.sh
-workload1:
-   sequential:
-   - workunit:
-       clients:
-         client.0:
-         - rados/load-gen-big.sh
-   - print: "**** done rados/load-gen-big.sh"
-   - workunit:
-       clients:
-         client.0:
-         - rados/test.sh
-         - cls
-   - print: "**** done rados/test.sh &  cls"
-   - workunit:
-       clients:
-         client.0:
-         - rbd/test_librbd.sh
-   - print: "**** done rbd/test_librbd.sh"
-upgrade-sequence1:
-   sequential:
-   - install.upgrade:
-       mon.a:
-         tag: v0.80.5
-       mon.b:
-         tag: v0.80.5
-       client.1:
-         tag: v0.80.5
-   - print: "**** done v0.80.5 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 1 mon/mds/osd"
-workload2:
-   sequential:
-   - workunit:
-       clients:
-         client.0:
-           - rbd/import_export.sh
-       env:
-         RBD_CREATE_ARGS: --new-format
-   - workunit:
-       clients:
-         client.0:
-           - cls/test_cls_rbd.sh
-upgrade-sequence2:
-   sequential:
-   - install.upgrade:
-       mon.a:
-         tag: v0.80.6
-       mon.b:
-         tag: v0.80.6
-       client.1:
-         tag: v0.80.6
-   - print: "**** done v0.80.6 install.upgrade"
-   - 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 2 osd/mon/mds"
-workload3:
-  rados:
-    clients: [client.0]
-    ops: 2000
-    objects: 50
-    op_weights:
-      read: 100
-      write: 100
-      delete: 50
-      snap_create: 50
-      snap_remove: 50
-      rollback: 50
-upgrade-sequence3:
-   sequential:
-   - install.upgrade:
-       mon.a:
-         branch: firefly
-       mon.b:
-         branch: firefly
-       client.1:
-         branch: firefly
-   - print: "**** done branch: firefly install.upgrade"
-   - ceph.restart:
-       daemons: [osd.0, osd.1, osd.2, osd.3, osd.4, osd.5]
-   - sleep:
-       duration: 60
-   - ceph.restart:   
-       daemons: [mon.a, mon.b, mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - print: "**** done ceph.restart daemons grouped"
-workload-x:
-  sequential:
-  - rgw: [client.0]
-  - s3tests:
-      client.0:
-        force-branch: firefly-original
-        rgw_server: client.0
-upgrade-sequence-x:
-   sequential:
-   - install.upgrade:
-       mon.a:
-         #branch: firefly
-       mon.b:
-         #branch: firefly
-       client.1:
-         #branch: firefly
-   - print: "**** done branch: -x 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 -x branch mds/osd/mon"

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

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

diff --git a/suites/upgrade/firefly/singleton/all/versions-steps.yaml b/suites/upgrade/firefly/singleton/all/versions-steps.yaml
deleted file mode 100644 (file)
index 6707847..0000000
--- a/suites/upgrade/firefly/singleton/all/versions-steps.yaml
+++ /dev/null
@@ -1,207 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - scrub
-    fs: xfs
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-  - osd.2
-- - mon.b
-  - mon.c
-  - osd.3
-  - osd.4
-  - osd.5
-  - client.0
-- - client.1
-tasks:
-- install:
-    tag: v0.80.4
-- print: "**** done v0.80.4 install"
-- ceph:
-   fs: xfs
-- print: "**** done ceph xfs"
-- sequential:
-   - workload
-- print: "**** done workload v0.80.4"
-- parallel:
-   - workload1
-   - upgrade-sequence1
-- print: "**** done parallel v0.80.5"
-- parallel:
-   - workload2
-   - upgrade-sequence2
-- print: "**** done parallel v0.80.6"
-- parallel:
-   - workload_firefly
-   - upgrade-sequence_firefly
-- print: "**** done parallel firefly branch"
-#######################
-workload:
-   workunit:
-      clients:
-         client.0:
-           - suites/blogbench.sh
-workload1:
-   sequential:
-   - workunit:
-       clients:
-         client.0:
-         - rados/load-gen-big.sh
-   - print: "**** done rados/load-gen-big.sh"
-   - workunit:
-       clients:
-         client.0:
-         - rados/test.sh
-         - cls
-   - print: "**** done rados/test.sh &  cls"
-   - workunit:
-       clients:
-         client.0:
-         - rbd/test_librbd.sh
-   - print: "**** done rbd/test_librbd.sh"
-upgrade-sequence1:
-   sequential:
-   - install.upgrade:
-       mon.a:
-         tag: v0.80.5
-       mon.b:
-         tag: v0.80.5
-       client.1:
-         tag: v0.80.5
-   - print: "**** done v0.80.5 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 1 mon/mds/osd"
-workload2:
-   sequential:
-   - workunit:
-       clients:
-         client.0:
-           - rbd/import_export.sh
-       env:
-         RBD_CREATE_ARGS: --new-format
-   - workunit:
-       clients:
-         client.0:
-           - cls/test_cls_rbd.sh
-upgrade-sequence2:
-   sequential:
-   - install.upgrade:
-       mon.a:
-         tag: v0.80.6
-       mon.b:
-         tag: v0.80.6
-       client.1:
-         tag: v0.80.6
-   - print: "**** done v0.80.6 install.upgrade"
-   - 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 2 osd/mon/mds"
-workload_firefly:
-  sequential:
-  - rgw: [client.0]
-  - s3tests:
-      client.0:
-        force-branch: firefly-original
-        rgw_server: client.0
-upgrade-sequence_firefly:
-   sequential:
-   - install.upgrade:
-       mon.a:
-         branch: firefly
-       mon.b:
-         branch: firefly
-       client.1:
-         branch: firefly
-   - print: "**** done branch: firefly 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 firefly current branch mds/osd/mon"
-

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

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

diff --git a/suites/upgrade/firefly/singleton/upgrade_client/upgrade_client_first.yaml b/suites/upgrade/firefly/singleton/upgrade_client/upgrade_client_first.yaml
new file mode 100644 (file)
index 0000000..1d8e2ca
--- /dev/null
+++ b/suites/upgrade/firefly/singleton/upgrade_client/upgrade_client_first.yaml
@@ -0,0 +1,69 @@
+# this case tests issue #9419 "dumpling->firefly upgrade, sending setallochint?"
+overrides:
+  ceph:
+    conf:
+      mon:
+        mon warn on legacy crush tunables: false
+    log-whitelist:
+      - scrub mismatch
+      - ScrubResult
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+- - client.0
+tasks:
+- install:
+   branch: dumpling
+- print: "**** done install dumpling" 
+- ceph:
+   fs: xfs
+- print: "**** done ceph"
+- install.upgrade:
+    client.0:
+- print: "**** done install.upgrade on clinet.0" 
+- install.upgrade:
+    mon.a:
+    mon.b:
+- print: "**** done install.upgrade" 
+- ceph.restart: 
+    daemons: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1]
+- print: "**** done restart all" 
+- workunit:
+    branch: firefly
+    clients:
+      client.0:
+      - rbd/test_librbd_python.sh
+- print: "**** done rbd/test_librbd_python.sh"
+- workunit:
+    branch: firefly
+    clients:
+      client.0:
+      - rados/test.sh
+      - cls
+- print: "**** done rados/test.sh &  cls" 
+- workunit:
+    branch: firefly
+    clients:
+      client.0:
+        - rbd/import_export.sh
+    env:
+      RBD_CREATE_ARGS: --new-format
+- print: "**** done rbd/import_export.sh"
+- workunit:
+    branch: firefly
+    clients:
+      client.0:
+        - cls/test_cls_rbd.sh
+- print: "**** done cls/test_cls_rbd.sh"
+- rgw: [client.0]
+- s3tests:
+    client.0:
+      force-branch: firefly-original
+      rgw_server: client.0
+- print: "**** done s3tests"

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

diff --git a/suites/upgrade/firefly/singleton/versions-steps-x/distros b/suites/upgrade/firefly/singleton/versions-steps-x/distros
new file mode 120000 (symlink)
index 0000000..ea78f65
--- /dev/null
+++ b/suites/upgrade/firefly/singleton/versions-steps-x/distros
@@ -0,0 +1 @@
+../../../../../distros/supported/
\ No newline at end of file

diff --git a/suites/upgrade/firefly/singleton/versions-steps-x/versions-steps-x.yaml b/suites/upgrade/firefly/singleton/versions-steps-x/versions-steps-x.yaml
new file mode 100644 (file)
index 0000000..f4a0c31
--- /dev/null
+++ b/suites/upgrade/firefly/singleton/versions-steps-x/versions-steps-x.yaml
@@ -0,0 +1,244 @@
+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
+- - client.1
+tasks:
+- install:
+    tag: v0.80.4
+- print: "**** done v0.80.4 install"
+- ceph:
+   fs: xfs
+- print: "**** done ceph xfs"
+- sequential:
+   - workload
+- print: "**** done workload v0.80.4"
+- parallel:
+   - workload1
+   - upgrade-sequence1
+- print: "**** done parallel v0.80.5"
+- parallel:
+   - workload2
+   - upgrade-sequence2
+- print: "**** done parallel v0.80.6"
+- parallel:
+   - workload3
+   - upgrade-sequence3
+- print: "**** done parallel firefly"
+- parallel:
+   - workload-x
+   - upgrade-sequence-x
+- print: "**** done parallel -x branch"
+#######################
+workload:
+   workunit:
+      clients:
+         client.0:
+           - suites/blogbench.sh
+workload1:
+   sequential:
+   - workunit:
+       clients:
+         client.0:
+         - rados/load-gen-big.sh
+   - print: "**** done rados/load-gen-big.sh"
+   - workunit:
+       clients:
+         client.0:
+         - rados/test.sh
+         - cls
+   - print: "**** done rados/test.sh &  cls"
+   - workunit:
+       clients:
+         client.0:
+         - rbd/test_librbd.sh
+   - print: "**** done rbd/test_librbd.sh"
+upgrade-sequence1:
+   sequential:
+   - install.upgrade:
+       mon.a:
+         tag: v0.80.5
+       mon.b:
+         tag: v0.80.5
+       client.1:
+         tag: v0.80.5
+   - print: "**** done v0.80.5 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 1 mon/mds/osd"
+workload2:
+   sequential:
+   - workunit:
+       clients:
+         client.0:
+           - rbd/import_export.sh
+       env:
+         RBD_CREATE_ARGS: --new-format
+   - workunit:
+       clients:
+         client.0:
+           - cls/test_cls_rbd.sh
+upgrade-sequence2:
+   sequential:
+   - install.upgrade:
+       mon.a:
+         tag: v0.80.6
+       mon.b:
+         tag: v0.80.6
+       client.1:
+         tag: v0.80.6
+   - print: "**** done v0.80.6 install.upgrade"
+   - 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 2 osd/mon/mds"
+workload3:
+  rados:
+    clients: [client.0]
+    ops: 2000
+    objects: 50
+    op_weights:
+      read: 100
+      write: 100
+      delete: 50
+      snap_create: 50
+      snap_remove: 50
+      rollback: 50
+upgrade-sequence3:
+   sequential:
+   - install.upgrade:
+       mon.a:
+         branch: firefly
+       mon.b:
+         branch: firefly
+       client.1:
+         branch: firefly
+   - print: "**** done branch: firefly install.upgrade"
+   - ceph.restart:
+       daemons: [osd.0, osd.1, osd.2, osd.3, osd.4, osd.5]
+   - sleep:
+       duration: 60
+   - ceph.restart:   
+       daemons: [mon.a, mon.b, mon.c]
+   - sleep:
+       duration: 60
+   - ceph.restart: [mds.a]
+   - sleep:
+       duration: 60
+   - print: "**** done ceph.restart daemons grouped"
+workload-x:
+  sequential:
+  - rgw: [client.0]
+  - s3tests:
+      client.0:
+        force-branch: firefly-original
+        rgw_server: client.0
+upgrade-sequence-x:
+   sequential:
+   - install.upgrade:
+       mon.a:
+         #branch: firefly
+       mon.b:
+         #branch: firefly
+       client.1:
+         #branch: firefly
+   - print: "**** done branch: -x 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 -x branch mds/osd/mon"

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

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

diff --git a/suites/upgrade/firefly/singleton/versions-steps/versions-steps.yaml b/suites/upgrade/firefly/singleton/versions-steps/versions-steps.yaml
new file mode 100644 (file)
index 0000000..6707847
--- /dev/null
+++ b/suites/upgrade/firefly/singleton/versions-steps/versions-steps.yaml
@@ -0,0 +1,207 @@
+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
+- - client.1
+tasks:
+- install:
+    tag: v0.80.4
+- print: "**** done v0.80.4 install"
+- ceph:
+   fs: xfs
+- print: "**** done ceph xfs"
+- sequential:
+   - workload
+- print: "**** done workload v0.80.4"
+- parallel:
+   - workload1
+   - upgrade-sequence1
+- print: "**** done parallel v0.80.5"
+- parallel:
+   - workload2
+   - upgrade-sequence2
+- print: "**** done parallel v0.80.6"
+- parallel:
+   - workload_firefly
+   - upgrade-sequence_firefly
+- print: "**** done parallel firefly branch"
+#######################
+workload:
+   workunit:
+      clients:
+         client.0:
+           - suites/blogbench.sh
+workload1:
+   sequential:
+   - workunit:
+       clients:
+         client.0:
+         - rados/load-gen-big.sh
+   - print: "**** done rados/load-gen-big.sh"
+   - workunit:
+       clients:
+         client.0:
+         - rados/test.sh
+         - cls
+   - print: "**** done rados/test.sh &  cls"
+   - workunit:
+       clients:
+         client.0:
+         - rbd/test_librbd.sh
+   - print: "**** done rbd/test_librbd.sh"
+upgrade-sequence1:
+   sequential:
+   - install.upgrade:
+       mon.a:
+         tag: v0.80.5
+       mon.b:
+         tag: v0.80.5
+       client.1:
+         tag: v0.80.5
+   - print: "**** done v0.80.5 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 1 mon/mds/osd"
+workload2:
+   sequential:
+   - workunit:
+       clients:
+         client.0:
+           - rbd/import_export.sh
+       env:
+         RBD_CREATE_ARGS: --new-format
+   - workunit:
+       clients:
+         client.0:
+           - cls/test_cls_rbd.sh
+upgrade-sequence2:
+   sequential:
+   - install.upgrade:
+       mon.a:
+         tag: v0.80.6
+       mon.b:
+         tag: v0.80.6
+       client.1:
+         tag: v0.80.6
+   - print: "**** done v0.80.6 install.upgrade"
+   - 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 2 osd/mon/mds"
+workload_firefly:
+  sequential:
+  - rgw: [client.0]
+  - s3tests:
+      client.0:
+        force-branch: firefly-original
+        rgw_server: client.0
+upgrade-sequence_firefly:
+   sequential:
+   - install.upgrade:
+       mon.a:
+         branch: firefly
+       mon.b:
+         branch: firefly
+       client.1:
+         branch: firefly
+   - print: "**** done branch: firefly 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 firefly current branch mds/osd/mon"
+