don't dup ceph task for new fsx jobs

diff --git a/suites/regression/thrash/workloads/rbd_fsx_cache_writeback.yaml b/suites/regression/thrash/workloads/rbd_fsx_cache_writeback.yaml
deleted file mode 120000 (symlink)
index a9f32e1b42f95cedcee46c20fe26ac4aa631ca01..0000000000000000000000000000000000000000
--- a/suites/regression/thrash/workloads/rbd_fsx_cache_writeback.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../basic/tasks/rbd_fsx_cache_writeback.yaml
\ No newline at end of file

diff --git a/suites/regression/thrash/workloads/rbd_fsx_cache_writeback.yaml b/suites/regression/thrash/workloads/rbd_fsx_cache_writeback.yaml
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..c603ffffecb36708a9a4a631958e30197648173b
--- /dev/null
+++ b/suites/regression/thrash/workloads/rbd_fsx_cache_writeback.yaml
@@ -0,0 +1,9 @@
+tasks:
+- rbd_fsx:
+    clients: [client.0]
+    ops: 20000
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd cache: true

diff --git a/suites/regression/thrash/workloads/rbd_fsx_cache_writethrough.yaml b/suites/regression/thrash/workloads/rbd_fsx_cache_writethrough.yaml
deleted file mode 120000 (symlink)
index 868062d9fc86ac3b1ad19d230591f95b1a51a73e..0000000000000000000000000000000000000000
--- a/suites/regression/thrash/workloads/rbd_fsx_cache_writethrough.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../basic/tasks/rbd_fsx_cache_writethrough.yaml
\ No newline at end of file

diff --git a/suites/regression/thrash/workloads/rbd_fsx_cache_writethrough.yaml b/suites/regression/thrash/workloads/rbd_fsx_cache_writethrough.yaml
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..fa9e8181778fb1fd69c5d836b829d863e06d9420
--- /dev/null
+++ b/suites/regression/thrash/workloads/rbd_fsx_cache_writethrough.yaml
@@ -0,0 +1,10 @@
+tasks:
+- rbd_fsx:
+    clients: [client.0]
+    ops: 20000
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd cache: true
+        rbd cache max dirty: 0

diff --git a/suites/regression/thrash/workloads/rbd_fsx_nocache.yaml b/suites/regression/thrash/workloads/rbd_fsx_nocache.yaml
deleted file mode 120000 (symlink)
index 7b9adf9fef85246822031febd3990443fcda7da4..0000000000000000000000000000000000000000
--- a/suites/regression/thrash/workloads/rbd_fsx_nocache.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../basic/tasks/rbd_fsx_nocache.yaml
\ No newline at end of file

diff --git a/suites/regression/thrash/workloads/rbd_fsx_nocache.yaml b/suites/regression/thrash/workloads/rbd_fsx_nocache.yaml
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..120ec00afbac668f8288edd5c97b65d1ff6d8b1b
--- /dev/null
+++ b/suites/regression/thrash/workloads/rbd_fsx_nocache.yaml
@@ -0,0 +1,9 @@
+tasks:
+- rbd_fsx:
+    clients: [client.0]
+    ops: 20000
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd cache: false