Fix directory names.

Make sure that the directories formerly number 0 through 9 get
scanned in the right order.
Signed-off-by: Warren Usui <warren.usui@inktank.com>

diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/0-cluster/start.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/0-cluster/start.yaml
deleted file mode 100644 (file)
index 504e20e..0000000
--- a/suites/upgrade/dumpling-firefly-x/stress-split/0-cluster/start.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      mon:
-        mon warn on legacy crush tunables: false
-roles:
-- - mon.a
-  - mon.b
-  - mds.a
-  - osd.0
-  - osd.1
-  - osd.2
-  - mon.c
-- - osd.3
-  - osd.4
-  - osd.5
-- - client.0

diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/00-cluster/start.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/00-cluster/start.yaml
new file mode 100644 (file)
index 0000000..504e20e
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/stress-split/00-cluster/start.yaml
@@ -0,0 +1,17 @@
+overrides:
+  ceph:
+    conf:
+      mon:
+        mon warn on legacy crush tunables: false
+roles:
+- - mon.a
+  - mon.b
+  - mds.a
+  - osd.0
+  - osd.1
+  - osd.2
+  - mon.c
+- - osd.3
+  - osd.4
+  - osd.5
+- - client.0

diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/01-dumpling-install/dumpling.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/01-dumpling-install/dumpling.yaml
new file mode 100644 (file)
index 0000000..c98631e
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/stress-split/01-dumpling-install/dumpling.yaml
@@ -0,0 +1,5 @@
+tasks:
+- install:
+    branch: dumpling
+- ceph:
+    fs: xfs

diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/02-partial-upgrade-firefly/firsthalf.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/02-partial-upgrade-firefly/firsthalf.yaml
new file mode 100644 (file)
index 0000000..1098b08
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/stress-split/02-partial-upgrade-firefly/firsthalf.yaml
@@ -0,0 +1,6 @@
+tasks:
+- install.upgrade:
+    osd.0:
+      branch: firefly
+- ceph.restart:
+    daemons: [osd.0, osd.1, osd.2]

diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/03-thrash/default.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/03-thrash/default.yaml
new file mode 100644 (file)
index 0000000..a85510e
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/stress-split/03-thrash/default.yaml
@@ -0,0 +1,12 @@
+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
+    thrash_primary_affinity: false

diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/04-mona-upgrade-firefly/mona.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/04-mona-upgrade-firefly/mona.yaml
new file mode 100644 (file)
index 0000000..b6ffb33
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/stress-split/04-mona-upgrade-firefly/mona.yaml
@@ -0,0 +1,5 @@
+tasks:
+- ceph.restart:
+    daemons: [mon.a]
+    wait-for-healthy: false
+    wait-for-osds-up: true

diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/05-workload/rbd-cls.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/05-workload/rbd-cls.yaml
new file mode 100644 (file)
index 0000000..db3dff7
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/stress-split/05-workload/rbd-cls.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+    branch: dumpling
+    clients:
+      client.0:
+        - cls/test_cls_rbd.sh

diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/05-workload/readwrite.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/05-workload/readwrite.yaml
new file mode 100644 (file)
index 0000000..c53e52b
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/stress-split/05-workload/readwrite.yaml
@@ -0,0 +1,9 @@
+tasks:
+- rados:
+    clients: [client.0]
+    ops: 4000
+    objects: 500
+    op_weights:
+      read: 45
+      write: 45
+      delete: 10

diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/06-monb-upgrade-firefly/monb.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/06-monb-upgrade-firefly/monb.yaml
new file mode 100644 (file)
index 0000000..513890c
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/stress-split/06-monb-upgrade-firefly/monb.yaml
@@ -0,0 +1,5 @@
+tasks:
+- ceph.restart:
+    daemons: [mon.b]
+    wait-for-healthy: false
+    wait-for-osds-up: true

diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/07-workload/radosbench.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/07-workload/radosbench.yaml
new file mode 100644 (file)
index 0000000..3940870
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/stress-split/07-workload/radosbench.yaml
@@ -0,0 +1,4 @@
+tasks:
+- radosbench:
+    clients: [client.0]
+    time: 1800

diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/07-workload/rbd_api.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/07-workload/rbd_api.yaml
new file mode 100644 (file)
index 0000000..1ecaee4
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/stress-split/07-workload/rbd_api.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+     clients:
+        client.0:
+           - rbd/test_librbd.sh

diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/08-monc-upgrade-firefly/monc.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/08-monc-upgrade-firefly/monc.yaml
new file mode 100644 (file)
index 0000000..73f22bd
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/stress-split/08-monc-upgrade-firefly/monc.yaml
@@ -0,0 +1,8 @@
+tasks:
+- install.upgrade:
+    mon.c:
+- ceph.restart:
+    daemons: [mon.c]
+    wait-for-healthy: false
+    wait-for-osds-up: true
+- ceph.wait_for_mon_quorum: [a, b, c]

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

diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/09-workload/rbd-python.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/09-workload/rbd-python.yaml
new file mode 100644 (file)
index 0000000..263b784
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/stress-split/09-workload/rbd-python.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+    clients:
+      client.0:
+        - rbd/test_librbd_python.sh

diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/09-workload/rgw-s3tests.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/09-workload/rgw-s3tests.yaml
new file mode 100644 (file)
index 0000000..e56a598
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/stress-split/09-workload/rgw-s3tests.yaml
@@ -0,0 +1,8 @@
+tasks:
+- rgw:
+    default_idle_timeout: 300
+    client.0:
+- s3tests:
+    client.0:
+      rgw_server: client.0
+

diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/1-dumpling-install/dumpling.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/1-dumpling-install/dumpling.yaml
deleted file mode 100644 (file)
index c98631e..0000000
--- a/suites/upgrade/dumpling-firefly-x/stress-split/1-dumpling-install/dumpling.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- install:
-    branch: dumpling
-- ceph:
-    fs: xfs

diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/2-partial-upgrade-firefly/firsthalf.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/2-partial-upgrade-firefly/firsthalf.yaml
deleted file mode 100644 (file)
index 1098b08..0000000
--- a/suites/upgrade/dumpling-firefly-x/stress-split/2-partial-upgrade-firefly/firsthalf.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- install.upgrade:
-    osd.0:
-      branch: firefly
-- ceph.restart:
-    daemons: [osd.0, osd.1, osd.2]

diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/3-thrash/default.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/3-thrash/default.yaml
deleted file mode 100644 (file)
index a85510e..0000000
--- a/suites/upgrade/dumpling-firefly-x/stress-split/3-thrash/default.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-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
-    thrash_primary_affinity: false

diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/4-mona-upgrade-firefly/mona.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/4-mona-upgrade-firefly/mona.yaml
deleted file mode 100644 (file)
index b6ffb33..0000000
--- a/suites/upgrade/dumpling-firefly-x/stress-split/4-mona-upgrade-firefly/mona.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- ceph.restart:
-    daemons: [mon.a]
-    wait-for-healthy: false
-    wait-for-osds-up: true

diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/5-workload/rbd-cls.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/5-workload/rbd-cls.yaml
deleted file mode 100644 (file)
index db3dff7..0000000
--- a/suites/upgrade/dumpling-firefly-x/stress-split/5-workload/rbd-cls.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    branch: dumpling
-    clients:
-      client.0:
-        - cls/test_cls_rbd.sh

diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/5-workload/readwrite.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/5-workload/readwrite.yaml
deleted file mode 100644 (file)
index c53e52b..0000000
--- a/suites/upgrade/dumpling-firefly-x/stress-split/5-workload/readwrite.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-tasks:
-- rados:
-    clients: [client.0]
-    ops: 4000
-    objects: 500
-    op_weights:
-      read: 45
-      write: 45
-      delete: 10

diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/6-monb-upgrade-firefly/monb.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/6-monb-upgrade-firefly/monb.yaml
deleted file mode 100644 (file)
index 513890c..0000000
--- a/suites/upgrade/dumpling-firefly-x/stress-split/6-monb-upgrade-firefly/monb.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- ceph.restart:
-    daemons: [mon.b]
-    wait-for-healthy: false
-    wait-for-osds-up: true

diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/7-workload/radosbench.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/7-workload/radosbench.yaml
deleted file mode 100644 (file)
index 3940870..0000000
--- a/suites/upgrade/dumpling-firefly-x/stress-split/7-workload/radosbench.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- radosbench:
-    clients: [client.0]
-    time: 1800

diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/7-workload/rbd_api.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/7-workload/rbd_api.yaml
deleted file mode 100644 (file)
index 1ecaee4..0000000
--- a/suites/upgrade/dumpling-firefly-x/stress-split/7-workload/rbd_api.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-     clients:
-        client.0:
-           - rbd/test_librbd.sh

diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/8-monc-upgrade-firefly/monc.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/8-monc-upgrade-firefly/monc.yaml
deleted file mode 100644 (file)
index 73f22bd..0000000
--- a/suites/upgrade/dumpling-firefly-x/stress-split/8-monc-upgrade-firefly/monc.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- install.upgrade:
-    mon.c:
-- ceph.restart:
-    daemons: [mon.c]
-    wait-for-healthy: false
-    wait-for-osds-up: true
-- ceph.wait_for_mon_quorum: [a, b, c]

diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/9-workload/+ b/suites/upgrade/dumpling-firefly-x/stress-split/9-workload/+
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/9-workload/rbd-python.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/9-workload/rbd-python.yaml
deleted file mode 100644 (file)
index 263b784..0000000
--- a/suites/upgrade/dumpling-firefly-x/stress-split/9-workload/rbd-python.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - rbd/test_librbd_python.sh

diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/9-workload/rgw-s3tests.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/9-workload/rgw-s3tests.yaml
deleted file mode 100644 (file)
index e56a598..0000000
--- a/suites/upgrade/dumpling-firefly-x/stress-split/9-workload/rgw-s3tests.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- rgw:
-    default_idle_timeout: 300
-    client.0:
-- s3tests:
-    client.0:
-      rgw_server: client.0
-