Added hammer-client-x to the mix

Renamed dirs to better reflect what is being tested
Removed old dirs
Added logging
Signed-off-by: Yuri Weinstein <yuri.weinstein@inktank.com>
(cherry picked from commit 3c8730d035a90f221c05526983c40f0a11da1ba6)

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

diff --git a/suites/upgrade/client-upgrade/dumpling-client-x/basic/% b/suites/upgrade/client-upgrade/dumpling-client-x/basic/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/upgrade/client-upgrade/dumpling-client-x/basic/0-cluster/start.yaml b/suites/upgrade/client-upgrade/dumpling-client-x/basic/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..1f53351
--- /dev/null
+++ b/suites/upgrade/client-upgrade/dumpling-client-x/basic/0-cluster/start.yaml
@@ -0,0 +1,15 @@
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+- - client.0
+overrides:
+  ceph:
+    log-whitelist:
+    - failed to encode map
+

diff --git a/suites/upgrade/client-upgrade/dumpling-client-x/basic/1-install/dumpling-client-x.yaml b/suites/upgrade/client-upgrade/dumpling-client-x/basic/1-install/dumpling-client-x.yaml
new file mode 100644 (file)
index 0000000..2335a5f
--- /dev/null
+++ b/suites/upgrade/client-upgrade/dumpling-client-x/basic/1-install/dumpling-client-x.yaml
@@ -0,0 +1,9 @@
+tasks:
+- install:
+   branch: dumpling
+- print: "**** done install dumpling"
+- install.upgrade:
+   client.0:
+- print: "**** done install.upgrade client.0"
+- ceph:
+- print: "**** done ceph"

diff --git a/suites/upgrade/client-upgrade/dumpling-client-x/basic/2-workload/rados_loadgen_big.yaml b/suites/upgrade/client-upgrade/dumpling-client-x/basic/2-workload/rados_loadgen_big.yaml
new file mode 100644 (file)
index 0000000..98df38c
--- /dev/null
+++ b/suites/upgrade/client-upgrade/dumpling-client-x/basic/2-workload/rados_loadgen_big.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+    clients:
+      client.0:
+        - rados/load-gen-big.sh
+- print: "**** done rados/load-gen-big.sh"

diff --git a/suites/upgrade/client-upgrade/dumpling-client-x/basic/2-workload/rbd_import_export.yaml b/suites/upgrade/client-upgrade/dumpling-client-x/basic/2-workload/rbd_import_export.yaml
new file mode 100644 (file)
index 0000000..57589e9
--- /dev/null
+++ b/suites/upgrade/client-upgrade/dumpling-client-x/basic/2-workload/rbd_import_export.yaml
@@ -0,0 +1,7 @@
+tasks:
+- workunit:
+    branch: dumpling
+    clients:
+      client.0:
+      - rbd/import_export.sh
+- print: "**** done rbd/import_export.sh"

diff --git a/suites/upgrade/client-upgrade/dumpling-x/basic/% b/suites/upgrade/client-upgrade/dumpling-x/basic/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/client-upgrade/dumpling-x/basic/0-cluster/start.yaml b/suites/upgrade/client-upgrade/dumpling-x/basic/0-cluster/start.yaml
deleted file mode 100644 (file)
index 1f53351..0000000
--- a/suites/upgrade/client-upgrade/dumpling-x/basic/0-cluster/start.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-- - client.0
-overrides:
-  ceph:
-    log-whitelist:
-    - failed to encode map
-

diff --git a/suites/upgrade/client-upgrade/dumpling-x/basic/1-install/dumpling-x.yaml b/suites/upgrade/client-upgrade/dumpling-x/basic/1-install/dumpling-x.yaml
deleted file mode 100644 (file)
index 431d9fd..0000000
--- a/suites/upgrade/client-upgrade/dumpling-x/basic/1-install/dumpling-x.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- install:
-   branch: dumpling
-- install.upgrade:
-   client.0:
-- ceph:

diff --git a/suites/upgrade/client-upgrade/dumpling-x/basic/2-workload/rados_loadgen_big.yaml b/suites/upgrade/client-upgrade/dumpling-x/basic/2-workload/rados_loadgen_big.yaml
deleted file mode 100644 (file)
index b003009..0000000
--- a/suites/upgrade/client-upgrade/dumpling-x/basic/2-workload/rados_loadgen_big.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - rados/load-gen-big.sh

diff --git a/suites/upgrade/client-upgrade/dumpling-x/basic/2-workload/rbd_import_export.yaml b/suites/upgrade/client-upgrade/dumpling-x/basic/2-workload/rbd_import_export.yaml
deleted file mode 100644 (file)
index 197ca41..0000000
--- a/suites/upgrade/client-upgrade/dumpling-x/basic/2-workload/rbd_import_export.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    branch: dumpling
-    clients:
-      client.0:
-      - rbd/import_export.sh

diff --git a/suites/upgrade/client-upgrade/firefly-client-x/basic/% b/suites/upgrade/client-upgrade/firefly-client-x/basic/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/upgrade/client-upgrade/firefly-client-x/basic/0-cluster/start.yaml b/suites/upgrade/client-upgrade/firefly-client-x/basic/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..db6f5e2
--- /dev/null
+++ b/suites/upgrade/client-upgrade/firefly-client-x/basic/0-cluster/start.yaml
@@ -0,0 +1,14 @@
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+- - client.0
+overrides:
+  ceph:
+    log-whitelist:
+    - failed to encode map

diff --git a/suites/upgrade/client-upgrade/firefly-client-x/basic/1-install/firefly-client-x.yaml b/suites/upgrade/client-upgrade/firefly-client-x/basic/1-install/firefly-client-x.yaml
new file mode 100644 (file)
index 0000000..39430da
--- /dev/null
+++ b/suites/upgrade/client-upgrade/firefly-client-x/basic/1-install/firefly-client-x.yaml
@@ -0,0 +1,10 @@
+tasks:
+- install:
+   branch: firefly 
+- print: "**** done install firefly"
+- install.upgrade:
+   exclude_packages: ['ceph-test', 'ceph-test-dbg']
+   client.0:
+- print: "**** done install.upgrade client.0"
+- ceph: 
+- print: "**** done ceph"

diff --git a/suites/upgrade/client-upgrade/firefly-client-x/basic/2-workload/rbd_cli_import_export.yaml b/suites/upgrade/client-upgrade/firefly-client-x/basic/2-workload/rbd_cli_import_export.yaml
new file mode 100644 (file)
index 0000000..6d4fd41
--- /dev/null
+++ b/suites/upgrade/client-upgrade/firefly-client-x/basic/2-workload/rbd_cli_import_export.yaml
@@ -0,0 +1,9 @@
+tasks:
+- workunit:
+    branch: firefly
+    clients:
+      client.0:
+        - rbd/import_export.sh
+    env:
+      RBD_CREATE_ARGS: --new-format
+- print: "**** done rbd/import_export.sh"

diff --git a/suites/upgrade/client-upgrade/firefly-x/basic/% b/suites/upgrade/client-upgrade/firefly-x/basic/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/client-upgrade/firefly-x/basic/0-cluster/start.yaml b/suites/upgrade/client-upgrade/firefly-x/basic/0-cluster/start.yaml
deleted file mode 100644 (file)
index db6f5e2..0000000
--- a/suites/upgrade/client-upgrade/firefly-x/basic/0-cluster/start.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-- - client.0
-overrides:
-  ceph:
-    log-whitelist:
-    - failed to encode map

diff --git a/suites/upgrade/client-upgrade/firefly-x/basic/1-install/firefly-x.yaml b/suites/upgrade/client-upgrade/firefly-x/basic/1-install/firefly-x.yaml
deleted file mode 100644 (file)
index 8341a83..0000000
--- a/suites/upgrade/client-upgrade/firefly-x/basic/1-install/firefly-x.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-   branch: firefly 
-- install.upgrade:
-   exclude_packages: ['ceph-test', 'ceph-test-dbg']
-   client.0:
-- ceph: 

diff --git a/suites/upgrade/client-upgrade/firefly-x/basic/2-workload/rbd_cli_import_export.yaml b/suites/upgrade/client-upgrade/firefly-x/basic/2-workload/rbd_cli_import_export.yaml
deleted file mode 100644 (file)
index 7fddb41..0000000
--- a/suites/upgrade/client-upgrade/firefly-x/basic/2-workload/rbd_cli_import_export.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- workunit:
-    branch: firefly
-    clients:
-      client.0:
-        - rbd/import_export.sh
-    env:
-      RBD_CREATE_ARGS: --new-format

diff --git a/suites/upgrade/client-upgrade/hammer-client-x/basic/% b/suites/upgrade/client-upgrade/hammer-client-x/basic/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/upgrade/client-upgrade/hammer-client-x/basic/0-cluster/start.yaml b/suites/upgrade/client-upgrade/hammer-client-x/basic/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..db6f5e2
--- /dev/null
+++ b/suites/upgrade/client-upgrade/hammer-client-x/basic/0-cluster/start.yaml
@@ -0,0 +1,14 @@
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+- - client.0
+overrides:
+  ceph:
+    log-whitelist:
+    - failed to encode map

diff --git a/suites/upgrade/client-upgrade/hammer-client-x/basic/1-install/hammer-client-x.yaml b/suites/upgrade/client-upgrade/hammer-client-x/basic/1-install/hammer-client-x.yaml
new file mode 100644 (file)
index 0000000..c6dd4ed
--- /dev/null
+++ b/suites/upgrade/client-upgrade/hammer-client-x/basic/1-install/hammer-client-x.yaml
@@ -0,0 +1,10 @@
+tasks:
+- install:
+   branch: hammer 
+- print: "**** done install hammer"
+- install.upgrade:
+   exclude_packages: ['ceph-test', 'ceph-test-dbg']
+   client.0:
+- print: "**** done install.upgrade client.0"
+- ceph: 
+- print: "**** done ceph"

diff --git a/suites/upgrade/client-upgrade/hammer-client-x/basic/2-workload/rbd_cli_import_export.yaml b/suites/upgrade/client-upgrade/hammer-client-x/basic/2-workload/rbd_cli_import_export.yaml
new file mode 100644 (file)
index 0000000..9bb4f94
--- /dev/null
+++ b/suites/upgrade/client-upgrade/hammer-client-x/basic/2-workload/rbd_cli_import_export.yaml
@@ -0,0 +1,9 @@
+tasks:
+- workunit:
+    branch: hammer
+    clients:
+      client.0:
+        - rbd/import_export.sh
+    env:
+      RBD_CREATE_ARGS: --new-format
+- print: "**** done rbd/import_export.sh"