Fixes #12425, moved versions-steps-x suite from upgrade/firefly to upgrade/firefly-x

as the old location was wrong and never ran correctely to upgrade tp -x

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>

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

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

diff --git a/suites/upgrade/firefly-x/singleton/versions-steps-x/versions-steps-x.yaml b/suites/upgrade/firefly-x/singleton/versions-steps-x/versions-steps-x.yaml
new file mode 100644 (file)
index 0000000..b139077
--- /dev/null
+++ b/suites/upgrade/firefly-x/singleton/versions-steps-x/versions-steps-x.yaml
@@ -0,0 +1,365 @@
+overrides:
+  ceph:
+    log-whitelist:
+    - scrub
+    - osd_map_max_advance
+    fs: xfs
+    conf:
+      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:
+- 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.7"
+- parallel:
+   - workload3
+   - upgrade-sequence3
+- print: "**** done parallel v0.80.8"
+- parallel:
+   - workload4
+   - upgrade-sequence4
+- print: "**** done parallel v0.80.9"
+- parallel:
+   - workload_firefly
+   - upgrade-sequence_firefly
+- 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:
+#   removed to fix #10176
+#   - workunit:
+#       clients:
+#         client.0:
+#           - rbd/import_export.sh
+#       env:
+#         RBD_CREATE_ARGS: --new-format
+   - workunit:
+       clients:
+         client.0:
+           - cls/test_cls_rbd.sh
+   - print: "**** done cls/test_cls_rbd.sh workload2"
+upgrade-sequence2:
+   sequential:
+   - install.upgrade:
+       mon.a:
+         tag: v0.80.7
+       mon.b:
+         tag: v0.80.7
+       client.1:
+         tag: v0.80.7
+   - print: "**** done v0.80.7 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:
+   sequential:
+   - workunit:
+       clients:
+         client.0:
+           - cls/test_cls_rbd.sh
+   - print: "**** done cls/test_cls_rbd.sh workload3"
+upgrade-sequence3:
+   sequential:
+   - install.upgrade:
+       mon.a:
+         tag: v0.80.8
+       mon.b:
+         tag: v0.80.8
+       client.1:
+         tag: v0.80.8
+   - print: "**** done v0.80.8 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 3 osd/mon/mds"
+workload4:
+   sequential:
+   - workunit:
+       clients:
+         client.0:
+         - rados/load-gen-big.sh
+   - print: "**** done rados/load-gen-big.sh workload4"
+   - workunit:
+       clients:
+         client.0:
+         - rados/test.sh
+         - cls
+   - print: "**** done rados/test.sh &  cls workload4"
+   - workunit:
+       clients:
+         client.0:
+         - rbd/test_librbd.sh
+   - print: "**** done rbd/test_librbd.sh workload4"
+upgrade-sequence4:
+   sequential:
+   - install.upgrade:
+       mon.a:
+         tag: v0.80.9
+       mon.b:
+         tag: v0.80.9
+       client.1:
+         tag: v0.80.9
+   - print: "**** done v0.80.9 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 upgrade-sequence4"
+workload_firefly:
+  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-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:
+       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
+        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"