dont run rbd tests parallel to upgrades

Signed-off-by: tamil <tamil.muthamizhan@inktank.com>

diff --git a/suites/upgrade/firefly/newer/2-workload/rbd.yaml b/suites/upgrade/firefly/newer/2-workload/rbd.yaml
deleted file mode 100644 (file)
index 0d2f3ad..0000000
--- a/suites/upgrade/firefly/newer/2-workload/rbd.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-workload:
-  sequential:
-  - workunit:
-      clients:
-         client.0:
-          - rbd/import_export.sh
-      env:
-        RBD_CREATE_ARGS: --new-format
-  - workunit:
-      clients:
-        client.0:
-          - cls/test_cls_rbd.sh

diff --git a/suites/upgrade/firefly/newer/4-final/rbd.yaml b/suites/upgrade/firefly/newer/4-final/rbd.yaml
new file mode 100644 (file)
index 0000000..ee82941
--- /dev/null
+++ b/suites/upgrade/firefly/newer/4-final/rbd.yaml
@@ -0,0 +1,12 @@
+tasks:
+- sequential:
+  - workunit:
+      clients:
+         client.0:
+          - rbd/import_export.sh
+      env:
+        RBD_CREATE_ARGS: --new-format
+  - workunit:
+      clients:
+        client.0:
+          - cls/test_cls_rbd.sh

diff --git a/suites/upgrade/firefly/older/2-workload/rbd.yaml b/suites/upgrade/firefly/older/2-workload/rbd.yaml
deleted file mode 100644 (file)
index e9958c0..0000000
--- a/suites/upgrade/firefly/older/2-workload/rbd.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-workload:
-  sequential:
-  - workunit:
-      clients:
-        client.0:
-          - rbd/import_export.sh
-      env:
-        RBD_CREATE_ARGS: --new-format
-  - workunit:
-      clients:
-        client.0:
-          - cls/test_cls_rbd.sh

diff --git a/suites/upgrade/firefly/older/4-final/rbd.yaml b/suites/upgrade/firefly/older/4-final/rbd.yaml
new file mode 100644 (file)
index 0000000..ee82941
--- /dev/null
+++ b/suites/upgrade/firefly/older/4-final/rbd.yaml
@@ -0,0 +1,12 @@
+tasks:
+- sequential:
+  - workunit:
+      clients:
+         client.0:
+          - rbd/import_export.sh
+      env:
+        RBD_CREATE_ARGS: --new-format
+  - workunit:
+      clients:
+        client.0:
+          - cls/test_cls_rbd.sh