upgrade/hammer-jewel-x: redo stress-split

Make this easy: write a singel yaml that does the hammer install,
some limited work, then upgardes to jewel.  Copy it from the
parallel suite.  Then, symlink all of the rest from the jewel-x
stress-split suite.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/0-cluster b/suites/upgrade/hammer-jewel-x/stress-split/0-cluster
new file mode 120000 (symlink)
index 0000000..9bb7a0d
--- /dev/null
+++ b/suites/upgrade/hammer-jewel-x/stress-split/0-cluster
@@ -0,0 +1 @@
+../../jewel-x/stress-split/0-cluster
\ No newline at end of file

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/00-cluster/start.yaml b/suites/upgrade/hammer-jewel-x/stress-split/00-cluster/start.yaml
deleted file mode 100644 (file)
index 129635f..0000000
--- a/suites/upgrade/hammer-jewel-x/stress-split/00-cluster/start.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - failed to encode map
-    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/hammer-jewel-x/stress-split/01-hammer-install/hammer.yaml b/suites/upgrade/hammer-jewel-x/stress-split/01-hammer-install/hammer.yaml
deleted file mode 100644 (file)
index 47a1a39..0000000
--- a/suites/upgrade/hammer-jewel-x/stress-split/01-hammer-install/hammer.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- install:
-    branch: hammer
-- ceph:
-    fs: xfs
-- print: "**** done install hammer"

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/02-partial-upgrade-jewel/firsthalf.yaml b/suites/upgrade/hammer-jewel-x/stress-split/02-partial-upgrade-jewel/firsthalf.yaml
deleted file mode 100644 (file)
index 990ccba..0000000
--- a/suites/upgrade/hammer-jewel-x/stress-split/02-partial-upgrade-jewel/firsthalf.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- install.upgrade:
-    osd.0:
-      branch: jewel
-- print: "**** done install.upgrade jewel"
-- ceph.restart:
-    daemons: [osd.0, osd.1, osd.2]
-- print: "**** done 02-partial-upgrade-jewel"

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/03-workload/rbd.yaml b/suites/upgrade/hammer-jewel-x/stress-split/03-workload/rbd.yaml
deleted file mode 100644 (file)
index 07541d6..0000000
--- a/suites/upgrade/hammer-jewel-x/stress-split/03-workload/rbd.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - cls/test_cls_rbd.sh
-- print: "**** done 03-workload/rbd.yaml"

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/04-mona-upgrade-jewel/mona.yaml b/suites/upgrade/hammer-jewel-x/stress-split/04-mona-upgrade-jewel/mona.yaml
deleted file mode 100644 (file)
index 991b94f..0000000
--- a/suites/upgrade/hammer-jewel-x/stress-split/04-mona-upgrade-jewel/mona.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph.restart:
-    daemons: [mon.a]
-    wait-for-healthy: false
-    wait-for-osds-up: true
-- print: "*** done restart mon.a 04-mona-upgrade-jewel/mona.yaml"

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/05-workload/+ b/suites/upgrade/hammer-jewel-x/stress-split/05-workload/+
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/05-workload/rbd-cls.yaml b/suites/upgrade/hammer-jewel-x/stress-split/05-workload/rbd-cls.yaml
deleted file mode 100644 (file)
index 507c8f9..0000000
--- a/suites/upgrade/hammer-jewel-x/stress-split/05-workload/rbd-cls.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - cls/test_cls_rbd.sh
-- print: "**** done 05-workload/rbd-cls.yaml"

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/05-workload/readwrite.yaml b/suites/upgrade/hammer-jewel-x/stress-split/05-workload/readwrite.yaml
deleted file mode 100644 (file)
index cacfde1..0000000
--- a/suites/upgrade/hammer-jewel-x/stress-split/05-workload/readwrite.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- rados:
-    clients: [client.0]
-    ops: 4000
-    objects: 500
-    write_append_excl: false
-    op_weights:
-      read: 45
-      write: 45
-      delete: 10
-- print: "**** done 05-workload/readwrite.yaml"

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/06-monb-upgrade-jewel/monb.yaml b/suites/upgrade/hammer-jewel-x/stress-split/06-monb-upgrade-jewel/monb.yaml
deleted file mode 100644 (file)
index 2368ee3..0000000
--- a/suites/upgrade/hammer-jewel-x/stress-split/06-monb-upgrade-jewel/monb.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph.restart:
-    daemons: [mon.b]
-    wait-for-healthy: false
-    wait-for-osds-up: true
-- print: "**** done restarted mon.b 06-monb-upgrade-jewel/monb.yaml"

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/07-workload/+ b/suites/upgrade/hammer-jewel-x/stress-split/07-workload/+
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/07-workload/radosbench.yaml b/suites/upgrade/hammer-jewel-x/stress-split/07-workload/radosbench.yaml
deleted file mode 100644 (file)
index 7f10f7a..0000000
--- a/suites/upgrade/hammer-jewel-x/stress-split/07-workload/radosbench.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-tasks:
-- full_sequential:
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-- print: "**** done 07-workload/radosbench.yaml"

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/07-workload/rbd_api.yaml b/suites/upgrade/hammer-jewel-x/stress-split/07-workload/rbd_api.yaml
deleted file mode 100644 (file)
index 0029eec..0000000
--- a/suites/upgrade/hammer-jewel-x/stress-split/07-workload/rbd_api.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-#tasks:
-#- workunit:
-#     clients:
-#        client.0:
-#           - rbd/test_librbd.sh
-#- print: "**** done 07-workload/rbd_api.yaml"

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/08-monc-upgrade-jewel/monc.yaml b/suites/upgrade/hammer-jewel-x/stress-split/08-monc-upgrade-jewel/monc.yaml
deleted file mode 100644 (file)
index 15a7105..0000000
--- a/suites/upgrade/hammer-jewel-x/stress-split/08-monc-upgrade-jewel/monc.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- ceph.restart:
-    daemons: [mon.c]
-    wait-for-healthy: false
-    wait-for-osds-up: true
-- print: "**** done ceph.restart mon.c"
-- ceph.wait_for_mon_quorum: [a, b, c]
-- print: "**** done 08-monc-upgrade-jewel/monc.yaml"

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/09-workload/rbd-python.yaml b/suites/upgrade/hammer-jewel-x/stress-split/09-workload/rbd-python.yaml
deleted file mode 100644 (file)
index 9320356..0000000
--- a/suites/upgrade/hammer-jewel-x/stress-split/09-workload/rbd-python.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-#tasks:
-#- workunit:
-#    branch: hammer
-#    clients:
-#      client.0:
-#        - rbd/test_librbd_python.sh
-#- print: "**** done 09-workload/rbd-python.yaml"

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/1-hammer-install-and-upgrade-to-jewel/hammer-to-jewel.yaml b/suites/upgrade/hammer-jewel-x/stress-split/1-hammer-install-and-upgrade-to-jewel/hammer-to-jewel.yaml
new file mode 100644 (file)
index 0000000..0ed59c5
--- /dev/null
+++ b/suites/upgrade/hammer-jewel-x/stress-split/1-hammer-install-and-upgrade-to-jewel/hammer-to-jewel.yaml
@@ -0,0 +1,89 @@
+tasks:
+- install:
+    branch: hammer
+    exclude_packages:
+    - ceph-mgr
+    - libcephfs2
+    - libcephfs-devel
+    - libcephfs-dev
+- print: '**** done hammer'
+- ceph:
+    fs: xfs
+- install.upgrade:
+    exclude_packages:
+    - ceph-mgr
+    - libcephfs2
+    - libcephfs-devel
+    - libcephfs-dev
+    osd.0:
+      branch: jewel
+    osd.3:
+      branch: jewel
+- print: '*** client.0 upgraded packages to jewel'
+- parallel:
+  - workload-h-j
+  - upgrade-sequence-h-j
+- print: '**** done parallel'
+- install.upgrade:
+    client.0:
+      branch: jewel
+    exclude_packages:
+    - ceph-mgr
+    - libcephfs2
+    - libcephfs-devel
+    - libcephfs-dev
+- exec:
+    osd.0:
+    - ceph osd set sortbitwise
+    - ceph osd set require_jewel_osds
+    - for p in `ceph osd pool ls` ; do ceph osd pool set $p use_gmt_hitset true ;
+      done
+- install.upgrade:
+    client.0:
+      branch: jewel
+    exclude_packages:
+    - ceph-mgr
+    - libcephfs2
+    - libcephfs-devel
+    - libcephfs-dev
+- print: '**** done install.upgrade client.0 to jewel'
+upgrade-sequence-h-j:
+  sequential:
+  - ceph.restart:
+      daemons:
+      - osd.0
+      - osd.1
+      - osd.2
+      - osd.3
+      - osd.4
+      - osd.5
+      wait-for-healthy: false
+      wait-for-osds-up: true
+  - ceph.restart:
+      daemons:
+      - mon.a
+      - mon.b
+      - mon.c
+      wait-for-healthy: false
+      wait-for-osds-up: true
+  - print: '**** done ceph.restart do not wait for healthy'
+  - exec:
+      mon.a:
+      - sleep 300
+      - ceph osd set require_jewel_osds
+  - ceph.healthy: null
+  - print: '**** done ceph.healthy'
+workload-h-j:
+  full_sequential:
+    - workunit:
+        branch: hammer
+        clients:
+          client.0:
+            - cls
+    - print: "**** done cls 2-workload"
+    - workunit:
+        branch: hammer
+        clients:
+          client.0:
+            - rbd/test_librbd.sh
+    - print: "**** done rbd/test_librbd.sh 2-workload"

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/10-osds-upgrade-jewel/secondhalf.yaml b/suites/upgrade/hammer-jewel-x/stress-split/10-osds-upgrade-jewel/secondhalf.yaml
deleted file mode 100644 (file)
index 9ee024e..0000000
--- a/suites/upgrade/hammer-jewel-x/stress-split/10-osds-upgrade-jewel/secondhalf.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- install.upgrade:
-    osd.3:
-       branch: jewel
-- print: "**** done install.upgrade jewel"
-- ceph.restart:
-    daemons: [osd.3, osd.4, osd.5]
-- print: "**** done 10-osds-upgrade-jewel/secondhalf.yaml"

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/11-workload/snaps-few-objects.yaml b/suites/upgrade/hammer-jewel-x/stress-split/11-workload/snaps-few-objects.yaml
deleted file mode 100644 (file)
index b9f0271..0000000
--- a/suites/upgrade/hammer-jewel-x/stress-split/11-workload/snaps-few-objects.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-tasks:
-- rados:
-    clients: [client.0]
-    ops: 4000
-    objects: 50
-    write_append_excl: false
-    op_weights:
-      read: 100
-      write: 100
-      delete: 50
-      snap_create: 50
-      snap_remove: 50
-      rollback: 50
-- print: "**** done 11-workload/snaps-few-objects.yaml"

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/12-partial-upgrade-x/first.yaml b/suites/upgrade/hammer-jewel-x/stress-split/12-partial-upgrade-x/first.yaml
deleted file mode 100644 (file)
index 9f52417..0000000
--- a/suites/upgrade/hammer-jewel-x/stress-split/12-partial-upgrade-x/first.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install.upgrade:
-    osd.0:
-- print: "**** done install.upgrade -x osd.0"
-- ceph.restart:
-    daemons: [osd.0, osd.1, osd.2]
-- print: "**** done 12-partial-upgrade-x/first.yaml"

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/13-workload/rados_loadgen_big.yaml b/suites/upgrade/hammer-jewel-x/stress-split/13-workload/rados_loadgen_big.yaml
deleted file mode 100644 (file)
index 90698cb..0000000
--- a/suites/upgrade/hammer-jewel-x/stress-split/13-workload/rados_loadgen_big.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - rados/load-gen-big.sh
-- print: "**** done 13-workload/rados_loadgen_big.yaml"

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/14-mona-upgrade-x/mona.yaml b/suites/upgrade/hammer-jewel-x/stress-split/14-mona-upgrade-x/mona.yaml
deleted file mode 100644 (file)
index d83162c..0000000
--- a/suites/upgrade/hammer-jewel-x/stress-split/14-mona-upgrade-x/mona.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph.restart:
-    daemons: [mon.a]
-    wait-for-healthy: false
-    wait-for-osds-up: true
-- print: "**** done ceph.restart mon.a 14-mona-upgrade-x/mona.yaml"

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/15-workload/rbd-import-export.yaml b/suites/upgrade/hammer-jewel-x/stress-split/15-workload/rbd-import-export.yaml
deleted file mode 100644 (file)
index 7e6d43b..0000000
--- a/suites/upgrade/hammer-jewel-x/stress-split/15-workload/rbd-import-export.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - rbd/import_export.sh
-    env:
-      RBD_CREATE_ARGS: --new-format
-- print: "**** done 15-workload/rbd-import-export.yaml"

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/16-monb-upgrade-x/monb.yaml b/suites/upgrade/hammer-jewel-x/stress-split/16-monb-upgrade-x/monb.yaml
deleted file mode 100644 (file)
index 9123403..0000000
--- a/suites/upgrade/hammer-jewel-x/stress-split/16-monb-upgrade-x/monb.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph.restart:
-    daemons: [mon.b]
-    wait-for-healthy: false
-    wait-for-osds-up: true
-- print: "**** done ceph.restart mon.b 16-monb-upgrade-x/monb.yaml"

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/17-workload/readwrite.yaml b/suites/upgrade/hammer-jewel-x/stress-split/17-workload/readwrite.yaml
deleted file mode 100644 (file)
index ee49512..0000000
--- a/suites/upgrade/hammer-jewel-x/stress-split/17-workload/readwrite.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- rados:
-    clients: [client.0]
-    ops: 4000
-    objects: 500
-    write_append_excl: false
-    op_weights:
-      read: 45
-      write: 45
-      delete: 10
-- print: "**** done 17-workload/readwrite.yaml"

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/18-monc-upgrade-x/monc.yaml b/suites/upgrade/hammer-jewel-x/stress-split/18-monc-upgrade-x/monc.yaml
deleted file mode 100644 (file)
index f708237..0000000
--- a/suites/upgrade/hammer-jewel-x/stress-split/18-monc-upgrade-x/monc.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- ceph.restart:
-    daemons: [mon.c]
-    wait-for-healthy: false
-    wait-for-osds-up: true
-- print: "**** done ceph.restart mon.c"
-- ceph.wait_for_mon_quorum: [a, b, c]
-- print: "**** done 18-monc-upgrade-x/monc.yaml"

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/19-workload/radosbench.yaml b/suites/upgrade/hammer-jewel-x/stress-split/19-workload/radosbench.yaml
deleted file mode 100644 (file)
index d51088d..0000000
--- a/suites/upgrade/hammer-jewel-x/stress-split/19-workload/radosbench.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-tasks:
-- full_sequential:
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-  - radosbench:
-      clients: [client.0]
-      time: 150
-- print: "**** done 19-workload/radosbench.yaml"

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/2-partial-upgrade b/suites/upgrade/hammer-jewel-x/stress-split/2-partial-upgrade
new file mode 120000 (symlink)
index 0000000..fad7148
--- /dev/null
+++ b/suites/upgrade/hammer-jewel-x/stress-split/2-partial-upgrade
@@ -0,0 +1 @@
+../../jewel-x/stress-split/2-partial-upgrade/
\ No newline at end of file

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/20-osds-upgrade-x/osds_secondhalf.yaml b/suites/upgrade/hammer-jewel-x/stress-split/20-osds-upgrade-x/osds_secondhalf.yaml
deleted file mode 100644 (file)
index 38f011d..0000000
--- a/suites/upgrade/hammer-jewel-x/stress-split/20-osds-upgrade-x/osds_secondhalf.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- install.upgrade:
-    osd.3:
-- print: "**** done install.upgrade osd.3"
-- ceph.restart:
-    daemons: [osd.3, osd.4, osd.5]
-- print: "**** done 20-osds-upgrade-x/osds_secondhalf.yaml"
-- exec:
-   mon.b:
-     - ceph osd set require_jewel_osds
-- print: "**** done exec 'ceph osd set require_jewel_osds'"

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/+ b/suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/+
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/rados_stress_watch.yaml b/suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/rados_stress_watch.yaml
deleted file mode 100644 (file)
index a164bea..0000000
--- a/suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/rados_stress_watch.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - rados/stress_watch.sh
-- print: "**** done 21-final-workload/rados_stress_watch.yaml"

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/rbd_cls_tests.yaml b/suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/rbd_cls_tests.yaml
deleted file mode 100644 (file)
index 872cf62..0000000
--- a/suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/rbd_cls_tests.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - cls/test_cls_rbd.sh
-- print: "**** done 21-final-workload/rbd_cls_tests.yaml"

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/rgw-swift.yaml b/suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/rgw-swift.yaml
deleted file mode 100644 (file)
index 00a1fac..0000000
--- a/suites/upgrade/hammer-jewel-x/stress-split/21-final-workload/rgw-swift.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- rgw:
-    client.0:
-    default_idle_timeout: 300
-- swift:
-    client.0:
-      rgw_server: client.0
-- print: "**** done 21-final-workload/rgw-swift.yaml"

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/3-thrash b/suites/upgrade/hammer-jewel-x/stress-split/3-thrash
new file mode 120000 (symlink)
index 0000000..894fdeb
--- /dev/null
+++ b/suites/upgrade/hammer-jewel-x/stress-split/3-thrash
@@ -0,0 +1 @@
+../../jewel-x/stress-split/3-thrash/
\ No newline at end of file

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/4-mon b/suites/upgrade/hammer-jewel-x/stress-split/4-mon
new file mode 120000 (symlink)
index 0000000..da3b2aa
--- /dev/null
+++ b/suites/upgrade/hammer-jewel-x/stress-split/4-mon
@@ -0,0 +1 @@
+../../jewel-x/stress-split/4-mon/
\ No newline at end of file

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/5-workload b/suites/upgrade/hammer-jewel-x/stress-split/5-workload
new file mode 120000 (symlink)
index 0000000..6ebbbb4
--- /dev/null
+++ b/suites/upgrade/hammer-jewel-x/stress-split/5-workload
@@ -0,0 +1 @@
+../../jewel-x/stress-split/5-workload/
\ No newline at end of file

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/6-next-mon b/suites/upgrade/hammer-jewel-x/stress-split/6-next-mon
new file mode 120000 (symlink)
index 0000000..1a19a3a
--- /dev/null
+++ b/suites/upgrade/hammer-jewel-x/stress-split/6-next-mon
@@ -0,0 +1 @@
+../../jewel-x/stress-split/6-next-mon/
\ No newline at end of file

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/7-workload b/suites/upgrade/hammer-jewel-x/stress-split/7-workload
new file mode 120000 (symlink)
index 0000000..06ebb5f
--- /dev/null
+++ b/suites/upgrade/hammer-jewel-x/stress-split/7-workload
@@ -0,0 +1 @@
+../../jewel-x/stress-split/7-workload/
\ No newline at end of file

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/8-next-mon b/suites/upgrade/hammer-jewel-x/stress-split/8-next-mon
new file mode 120000 (symlink)
index 0000000..fa5113d
--- /dev/null
+++ b/suites/upgrade/hammer-jewel-x/stress-split/8-next-mon
@@ -0,0 +1 @@
+../../jewel-x/stress-split/8-next-mon/
\ No newline at end of file

diff --git a/suites/upgrade/hammer-jewel-x/stress-split/9-workload b/suites/upgrade/hammer-jewel-x/stress-split/9-workload
new file mode 120000 (symlink)
index 0000000..eb67cf7
--- /dev/null
+++ b/suites/upgrade/hammer-jewel-x/stress-split/9-workload
@@ -0,0 +1 @@
+../../jewel-x/stress-split/9-workload/
\ No newline at end of file

diff --git a/suites/upgrade/jewel-x/stress-split/0-cluster/start.yaml b/suites/upgrade/jewel-x/stress-split/0-cluster/start.yaml
index fd200d752a26254989fa66298a68e4a5b86dbb80..40536ab404713263ca6b5d5ec7e4998166fa2b2c 100644 (file)
--- a/suites/upgrade/jewel-x/stress-split/0-cluster/start.yaml
+++ b/suites/upgrade/jewel-x/stress-split/0-cluster/start.yaml
@@ -13,7 +13,6 @@ roles:
 - - mon.a
   - mon.b
   - mon.c
-  - mds.a
   - osd.0
   - osd.1
   - osd.2