Fixed dirs duplicates

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

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/3-firefly-upgrade/firefly.yaml b/suites/upgrade/dumpling-firefly-x/parallel/3-firefly-upgrade/firefly.yaml
deleted file mode 100644 (file)
index 4e925d0..0000000
--- a/suites/upgrade/dumpling-firefly-x/parallel/3-firefly-upgrade/firefly.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-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/4-workload/+ b/suites/upgrade/dumpling-firefly-x/parallel/4-workload/+
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/4-workload/rados_api.yaml b/suites/upgrade/dumpling-firefly-x/parallel/4-workload/rados_api.yaml
deleted file mode 100644 (file)
index 4757372..0000000
--- a/suites/upgrade/dumpling-firefly-x/parallel/4-workload/rados_api.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-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/4-workload/rados_loadgenbig.yaml b/suites/upgrade/dumpling-firefly-x/parallel/4-workload/rados_loadgenbig.yaml
deleted file mode 100644 (file)
index 451130e..0000000
--- a/suites/upgrade/dumpling-firefly-x/parallel/4-workload/rados_loadgenbig.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-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/4-workload/test_rbd_api.yaml b/suites/upgrade/dumpling-firefly-x/parallel/4-workload/test_rbd_api.yaml
deleted file mode 100644 (file)
index 1cf824d..0000000
--- a/suites/upgrade/dumpling-firefly-x/parallel/4-workload/test_rbd_api.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-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/4-workload/test_rbd_python.yaml b/suites/upgrade/dumpling-firefly-x/parallel/4-workload/test_rbd_python.yaml
deleted file mode 100644 (file)
index 9409329..0000000
--- a/suites/upgrade/dumpling-firefly-x/parallel/4-workload/test_rbd_python.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-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/5-upgrade-sequence/upgrade-by-daemon.yaml b/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-by-daemon.yaml
deleted file mode 100644 (file)
index 23726b8..0000000
--- a/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-by-daemon.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-       mon.a:
-   - print: "**** done install.upgrade mon.a to the version from teuthology-suite arg"
-   - install.upgrade:
-       mon.b:
-   - print: "**** done install.upgrade mon.b to the version from teuthology-suite arg"
-   - ceph.restart:
-       daemons: [mon.a]
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [mon.b]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mon.c]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.0]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.1]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.2]
-   - sleep:
-       duration: 60
-   - ceph.restart: [osd.3]
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - exec:
-      mon.a:
-        - ceph osd crush tunables firefly

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-by-type.yaml b/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-by-type.yaml
deleted file mode 100644 (file)
index e551183..0000000
--- a/suites/upgrade/dumpling-firefly-x/parallel/5-upgrade-sequence/upgrade-by-type.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-       mon.a:
-   - print: "**** done install.upgrade mon.a to the version from teuthology-suite arg"
-   - install.upgrade:
-       mon.b:
-   - print: "**** done install.upgrade mon.b to the version from teuthology-suite arg"
-   - ceph.restart:
-       daemons: [mon.a, mon.b, mon.c]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [osd.0, osd.1, osd.2, osd.3]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - exec:
-      mon.a:
-        - ceph osd crush tunables firefly

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

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/ec-rados-default.yaml b/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/ec-rados-default.yaml
deleted file mode 120000 (symlink)
index a8a0ae6..0000000
--- a/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/ec-rados-default.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../erasure-code/ec-rados-default.yaml
\ No newline at end of file

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml b/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml
deleted file mode 120000 (symlink)
index 4b9d9a4..0000000
--- a/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../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/6-final-workload/rados-snaps-few-objects.yaml b/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rados-snaps-few-objects.yaml
deleted file mode 100644 (file)
index bf85020..0000000
--- a/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rados-snaps-few-objects.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-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/6-final-workload/rados_loadgenmix.yaml b/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rados_loadgenmix.yaml
deleted file mode 100644 (file)
index 879b7b6..0000000
--- a/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rados_loadgenmix.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-  - workunit:
-      clients:
-        client.1:
-        - rados/load-gen-mix.sh

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rados_mon_thrash.yaml b/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rados_mon_thrash.yaml
deleted file mode 100644 (file)
index 5c4c629..0000000
--- a/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rados_mon_thrash.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-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/6-final-workload/rbd_cls.yaml b/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rbd_cls.yaml
deleted file mode 100644 (file)
index 908b79e..0000000
--- a/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rbd_cls.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      client.1:
-      - cls/test_cls_rbd.sh
-

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

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

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rgw_swift.yaml b/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rgw_swift.yaml
deleted file mode 100644 (file)
index 0ab9feb..0000000
--- a/suites/upgrade/dumpling-firefly-x/parallel/6-final-workload/rgw_swift.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-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