Added a step 'upgrade-sequence0' to initial install task, renamed dirs

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

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/1-dumpling-install/dumpling.yaml b/suites/upgrade/dumpling-firefly-x/parallel/1-dumpling-install/dumpling.yaml
index 34c7a798b6625b27939e8540aee454462536ed4f..1de55e7dce9685c1e76686c21d7ff00fed8f2b8f 100644 (file)
--- a/suites/upgrade/dumpling-firefly-x/parallel/1-dumpling-install/dumpling.yaml
+++ b/suites/upgrade/dumpling-firefly-x/parallel/1-dumpling-install/dumpling.yaml
@@ -6,4 +6,5 @@ tasks:
    fs: xfs
 - parallel:
    - workload
+   - upgrade-sequence
 - print: "**** done parallel"

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/dumpling-firefly-x/parallel/3-upgrade-sequence/upgrade-all.yaml
new file mode 100644 (file)
index 0000000..a0b3d36
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/parallel/3-upgrade-sequence/upgrade-all.yaml
@@ -0,0 +1,6 @@
+upgrade-sequence0:
+   sequential:
+   - install.upgrade:
+       mon.a:
+       mon.b:
+   - ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3]

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/4-firefly-upgrade/firefly.yaml b/suites/upgrade/dumpling-firefly-x/parallel/4-firefly-upgrade/firefly.yaml
new file mode 100644 (file)
index 0000000..4e925d0
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/parallel/4-firefly-upgrade/firefly.yaml
@@ -0,0 +1,18 @@
+tasks:
+   - install.upgrade:
+       mon.a:
+         branch: firefly
+       mon.b:
+         branch: firefly
+       client.0:
+         branch: firefly
+   - print: "**** done install.upgrade"
+   - ceph.restart:
+   - print: "**** done restart"
+   - parallel:
+     - workload2
+     - upgrade-sequence
+   - print: "**** done parallel"
+   - install.upgrade:
+       client.0:
+   - print: "**** done install.upgrade client.0 to the version from teuthology-suite arg"

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/5-workload/+ b/suites/upgrade/dumpling-firefly-x/parallel/5-workload/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/5-workload/rados_api.yaml b/suites/upgrade/dumpling-firefly-x/parallel/5-workload/rados_api.yaml
new file mode 100644 (file)
index 0000000..4757372
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/parallel/5-workload/rados_api.yaml
@@ -0,0 +1,9 @@
+workload2:
+  sequential:
+  - workunit:
+      branch: firefly
+      clients:
+        client.0:
+        - rados/test.sh
+        - cls
+  - print: "**** done #rados/test.sh and cls 2"

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/5-workload/rados_loadgenbig.yaml b/suites/upgrade/dumpling-firefly-x/parallel/5-workload/rados_loadgenbig.yaml
new file mode 100644 (file)
index 0000000..451130e
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/parallel/5-workload/rados_loadgenbig.yaml
@@ -0,0 +1,8 @@
+workload2:
+  sequential:
+  - workunit:
+      branch: firefly
+      clients:
+        client.0:
+        - rados/load-gen-big.sh
+  - print: "**** done rados/load-gen-big.sh 2"

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/5-workload/test_rbd_api.yaml b/suites/upgrade/dumpling-firefly-x/parallel/5-workload/test_rbd_api.yaml
new file mode 100644 (file)
index 0000000..1cf824d
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/parallel/5-workload/test_rbd_api.yaml
@@ -0,0 +1,8 @@
+workload2:
+  sequential:
+  - workunit:
+      branch: firefly
+      clients:
+        client.0:
+        - rbd/test_librbd.sh
+  - print: "**** done rbd/test_librbd.sh 2"

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/5-workload/test_rbd_python.yaml b/suites/upgrade/dumpling-firefly-x/parallel/5-workload/test_rbd_python.yaml
new file mode 100644 (file)
index 0000000..9409329
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/parallel/5-workload/test_rbd_python.yaml
@@ -0,0 +1,8 @@
+workload2:
+  sequential:
+  - workunit:
+      branch: firefly
+      clients:
+        client.0:
+        - rbd/test_librbd_python.sh
+  - print: "**** done rbd/test_librbd_python.sh 2"

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/6-upgrade-sequence/upgrade-by-daemon.yaml b/suites/upgrade/dumpling-firefly-x/parallel/6-upgrade-sequence/upgrade-by-daemon.yaml
new file mode 100644 (file)
index 0000000..319f895
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/parallel/6-upgrade-sequence/upgrade-by-daemon.yaml
@@ -0,0 +1,39 @@
+upgrade-sequence:
+   sequential:
+   - install.upgrade:
+       mon.a:
+   - print: "**** done install.upgrade mon.a to the version from teuthology-suite arg"
+   - ceph.restart:
+       daemons: [mon.a]
+       wait-for-healthy: true
+   - sleep:
+       duration: 60
+   - ceph.restart:
+       daemons: [osd.0, osd.1]
+       wait-for-healthy: true
+   - sleep:
+       duration: 60
+   - ceph.restart: [mds.a]
+   - sleep:
+       duration: 60
+   - print: "**** running mixed versions of osds and mons"
+   - exec:
+      mon.b:
+        - ceph osd crush tunables firefly
+   - install.upgrade:
+       mon.b:
+   - print: "**** done install.upgrade mon.b to the version from teuthology-suite arg"
+   - ceph.restart:
+       daemons: [mon.b, mon.c]
+       wait-for-healthy: true
+   - sleep:
+       duration: 60
+   - ceph.restart:
+       daemons: [osd.2, osd.3]
+       wait-for-healthy: true
+   - sleep:
+       duration: 60
+### removed to fix #9642
+#   - install.upgrade:
+#       client.0:
+#   - print: "*** client.0 upgraded"

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/+ b/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/ec-rados-plugin=jerasure-k=2-m=1.yaml b/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/ec-rados-plugin=jerasure-k=2-m=1.yaml
new file mode 120000 (symlink)
index 0000000..4baff9b
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/ec-rados-plugin=jerasure-k=2-m=1.yaml
@@ -0,0 +1 @@
+../../../../../erasure-code/ec-rados-plugin=jerasure-k=2-m=1.yaml
\ No newline at end of file

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml b/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml
new file mode 120000 (symlink)
index 0000000..4b9d9a4
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml
@@ -0,0 +1 @@
+../../../../../erasure-code/ec-rados-plugin=jerasure-k=3-m=1.yaml
\ No newline at end of file

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rados-snaps-few-objects.yaml b/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rados-snaps-few-objects.yaml
new file mode 100644 (file)
index 0000000..bf85020
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rados-snaps-few-objects.yaml
@@ -0,0 +1,12 @@
+tasks:
+- rados:
+    clients: [client.1]
+    ops: 4000
+    objects: 50
+    op_weights:
+      read: 100
+      write: 100
+      delete: 50
+      snap_create: 50
+      snap_remove: 50
+      rollback: 50

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rados_loadgenmix.yaml b/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rados_loadgenmix.yaml
new file mode 100644 (file)
index 0000000..879b7b6
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rados_loadgenmix.yaml
@@ -0,0 +1,5 @@
+tasks:
+  - workunit:
+      clients:
+        client.1:
+        - rados/load-gen-mix.sh

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rados_mon_thrash.yaml b/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rados_mon_thrash.yaml
new file mode 100644 (file)
index 0000000..5c4c629
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rados_mon_thrash.yaml
@@ -0,0 +1,10 @@
+tasks:
+   - sequential:
+      - mon_thrash:
+          revive_delay: 20
+          thrash_delay: 1
+      - workunit:
+          clients:
+            client.1:
+            - rados/test.sh
+      - print: "**** done rados/test.sh - 6-final-workload"

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rbd_cls.yaml b/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rbd_cls.yaml
new file mode 100644 (file)
index 0000000..908b79e
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rbd_cls.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+    clients:
+      client.1:
+      - cls/test_cls_rbd.sh
+

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rbd_import_export.yaml b/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rbd_import_export.yaml
new file mode 100644 (file)
index 0000000..a7ce214
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rbd_import_export.yaml
@@ -0,0 +1,7 @@
+tasks:
+- workunit:
+     clients:
+        client.1:
+        - rbd/import_export.sh
+     env:
+        RBD_CREATE_ARGS: --new-format

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rgw_s3tests.yaml b/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rgw_s3tests.yaml
new file mode 100644 (file)
index 0000000..22c3a3f
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rgw_s3tests.yaml
@@ -0,0 +1,5 @@
+tasks:
+- rgw: [client.1]
+- s3tests:
+    client.1:
+      rgw_server: client.1

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rgw_swift.yaml b/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rgw_swift.yaml
new file mode 100644 (file)
index 0000000..0ab9feb
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/parallel/7-final-workload/rgw_swift.yaml
@@ -0,0 +1,6 @@
+tasks:
+# Uncomment the next line if you have not already included rgw_s3tests.yaml in your test.
+# - rgw: [client.1]
+- swift:
+    client.1:
+      rgw_server: client.1