Excluded 'libcephfs2','libcephfs-devel','libcephfs-dev'

Removed firefly and infernalis paths
Removed mds role from hammer (per chat with Jason)
Add "fs: xfs" override

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>

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

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
deleted file mode 100644 (file)
index e2ea18d..0000000
--- a/suites/upgrade/client-upgrade/firefly-client-x/basic/0-cluster/start.yaml
+++ /dev/null
@@ -1,18 +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
-    conf:
-      client:
-        rbd default format: 1
-        rbd default features: 1

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
deleted file mode 100644 (file)
index 471412d..0000000
--- a/suites/upgrade/client-upgrade/firefly-client-x/basic/1-install/firefly-client-x.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- install:
-    branch: firefly
-    exclude_packages: ['ceph-mgr']
-- 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
deleted file mode 100644 (file)
index 6d4fd41..0000000
--- a/suites/upgrade/client-upgrade/firefly-client-x/basic/2-workload/rbd_cli_import_export.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-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/hammer-client-x/basic/0-cluster/start.yaml b/suites/upgrade/client-upgrade/hammer-client-x/basic/0-cluster/start.yaml
index db6f5e2fe99040cc6d3b186e125b60bf2c9341d1..ea9c37d0dbb7600742bc3eab95d0da411fb4f385 100644 (file)
--- 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
@@ -1,6 +1,5 @@
 roles:
 - - mon.a
-  - mds.a
   - osd.0
   - osd.1
 - - mon.b
@@ -12,3 +11,4 @@ overrides:
   ceph:
     log-whitelist:
     - failed to encode map
+    fs: xfs

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
index 4fa180b22a02544ed446c2a0abb68f2d262570ab..ffd41949744180c7c15bed5303db6bec56b31b49 100644 (file)
--- 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
@@ -1,7 +1,7 @@
 tasks:
 - install:
     branch: hammer 
-    exclude_packages: ['ceph-mgr']
+    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
 - print: "**** done install hammer"
 upgrade_workload:
   sequential:

diff --git a/suites/upgrade/client-upgrade/hammer-client-x/rbd/0-cluster/start.yaml b/suites/upgrade/client-upgrade/hammer-client-x/rbd/0-cluster/start.yaml
index 4d92f8005e8c65014839b9b8b73e67c132c6debf..4c9f32493acf88c86ac1a915cd63088a9f549d1e 100644 (file)
--- a/suites/upgrade/client-upgrade/hammer-client-x/rbd/0-cluster/start.yaml
+++ b/suites/upgrade/client-upgrade/hammer-client-x/rbd/0-cluster/start.yaml
@@ -11,6 +11,7 @@ overrides:
   ceph:
     log-whitelist:
     - failed to encode map
+    fs: xfs
     conf:
       client:
         rbd default features: 1

diff --git a/suites/upgrade/client-upgrade/hammer-client-x/rbd/1-install/hammer-client-x.yaml b/suites/upgrade/client-upgrade/hammer-client-x/rbd/1-install/hammer-client-x.yaml
index 54195b0507a6812da993b8d32c30cfc34d9c41db..c70647bcedb4dd6e1310ab07a409f76efff61cbb 100644 (file)
--- a/suites/upgrade/client-upgrade/hammer-client-x/rbd/1-install/hammer-client-x.yaml
+++ b/suites/upgrade/client-upgrade/hammer-client-x/rbd/1-install/hammer-client-x.yaml
@@ -1,7 +1,7 @@
 tasks:
 - install:
     branch: hammer
-    exclude_packages: ['ceph-mgr']
+    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
 - print: "**** done install hammer"
 - install.upgrade:
    exclude_packages: ['ceph-test', 'ceph-test-dbg']

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

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

diff --git a/suites/upgrade/client-upgrade/infernalis-client-x/basic/1-install/infernalis-client-x.yaml b/suites/upgrade/client-upgrade/infernalis-client-x/basic/1-install/infernalis-client-x.yaml
deleted file mode 100644 (file)
index 1b71ee2..0000000
--- a/suites/upgrade/client-upgrade/infernalis-client-x/basic/1-install/infernalis-client-x.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- install:
-    branch: infernalis 
-    exclude_packages: ['ceph-mgr']
-- print: "**** done install infernalis"
-upgrade_workload:
-  sequential:
-  - install.upgrade:
-      exclude_packages: ['ceph-test', 'ceph-test-dbg']
-      client.0:
-  - print: "**** done install.upgrade to -x on client.0"

diff --git a/suites/upgrade/client-upgrade/infernalis-client-x/basic/2-workload/rbd_api_tests.yaml b/suites/upgrade/client-upgrade/infernalis-client-x/basic/2-workload/rbd_api_tests.yaml
deleted file mode 100644 (file)
index 99321c6..0000000
--- a/suites/upgrade/client-upgrade/infernalis-client-x/basic/2-workload/rbd_api_tests.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-tasks:
-- exec:
-    client.0:
-    - "cp $(which ceph_test_librbd_api) $TESTDIR/ceph_test_librbd_api"
-- sequential:
-  - upgrade_workload
-- ceph: 
-- print: "**** done ceph"
-- exec:
-    client.0:
-    - "cp --force $TESTDIR/ceph_test_librbd_api $(which ceph_test_librbd_api)"
-    - "rm -rf $TESTDIR/ceph_test_librbd_api"
-- print: "**** done reverting to hammer ceph_test_librbd_api"
-- workunit:
-    branch: infernalis
-    clients:
-      client.0:
-      - rbd/test_librbd_api.sh
-    env:
-      RBD_FEATURES: "13"
-- print: "**** done rbd/test_librbd_api.sh"

diff --git a/suites/upgrade/client-upgrade/infernalis-client-x/basic/2-workload/rbd_cli_import_export.yaml b/suites/upgrade/client-upgrade/infernalis-client-x/basic/2-workload/rbd_cli_import_export.yaml
deleted file mode 100644 (file)
index 5adc5ac..0000000
--- a/suites/upgrade/client-upgrade/infernalis-client-x/basic/2-workload/rbd_cli_import_export.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-tasks:
-- sequential:
-  - upgrade_workload
-- ceph: 
-- print: "**** done ceph"
-- workunit:
-    branch: infernalis
-    clients:
-      client.0:
-      - rbd/import_export.sh
-    env:
-      RBD_CREATE_ARGS: --image-feature layering,exclusive-lock,object-map
-- print: "**** done rbd/import_export.sh"

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

diff --git a/suites/upgrade/client-upgrade/infernalis-client-x/rbd/0-cluster/start.yaml b/suites/upgrade/client-upgrade/infernalis-client-x/rbd/0-cluster/start.yaml
deleted file mode 100644 (file)
index 4d92f80..0000000
--- a/suites/upgrade/client-upgrade/infernalis-client-x/rbd/0-cluster/start.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-roles:
-- - mon.a
-  - mon.b
-  - mon.c
-  - osd.0
-  - osd.1
-  - osd.2
-  - client.0
-- - client.1
-overrides:
-  ceph:
-    log-whitelist:
-    - failed to encode map
-    conf:
-      client:
-        rbd default features: 1

diff --git a/suites/upgrade/client-upgrade/infernalis-client-x/rbd/1-install/infernalis-client-x.yaml b/suites/upgrade/client-upgrade/infernalis-client-x/rbd/1-install/infernalis-client-x.yaml
deleted file mode 100644 (file)
index 9e5daea..0000000
--- a/suites/upgrade/client-upgrade/infernalis-client-x/rbd/1-install/infernalis-client-x.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- install:
-    branch: infernalis
-    exclude_packages: ['ceph-mgr']
-- print: "**** done install infernalis"
-- install.upgrade:
-   exclude_packages: ['ceph-test', 'ceph-test-dbg']
-   client.1:
-- print: "**** done install.upgrade to -x on client.0"
-- ceph:
-- print: "**** done ceph"

diff --git a/suites/upgrade/client-upgrade/infernalis-client-x/rbd/2-workload/rbd_notification_tests.yaml b/suites/upgrade/client-upgrade/infernalis-client-x/rbd/2-workload/rbd_notification_tests.yaml
deleted file mode 100644 (file)
index f83742f..0000000
--- a/suites/upgrade/client-upgrade/infernalis-client-x/rbd/2-workload/rbd_notification_tests.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-tasks:
-- workunit:
-    branch: infernalis
-    clients:
-      client.0:
-        - rbd/notify_master.sh
-      client.1:
-        - rbd/notify_slave.sh
-    env:
-      RBD_FEATURES: "13"
-- print: "**** done rbd: old librbd -> new librbd"
-- workunit:
-    branch: infernalis
-    clients:
-      client.0:
-        - rbd/notify_slave.sh
-      client.1:
-        - rbd/notify_master.sh
-    env:
-      RBD_FEATURES: "13"
-- print: "**** done rbd: new librbd -> old librbd"

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

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

diff --git a/suites/upgrade/client-upgrade/jewel-client-x/basic/1-install/jewel-client-x.yaml b/suites/upgrade/client-upgrade/jewel-client-x/basic/1-install/jewel-client-x.yaml
new file mode 100644 (file)
index 0000000..87ea402
--- /dev/null
+++ b/suites/upgrade/client-upgrade/jewel-client-x/basic/1-install/jewel-client-x.yaml
@@ -0,0 +1,11 @@
+tasks:
+- install:
+    branch: jewel 
+    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
+- print: "**** done install jewel"
+upgrade_workload:
+  sequential:
+  - install.upgrade:
+      exclude_packages: ['ceph-test', 'ceph-test-dbg']
+      client.0:
+  - print: "**** done install.upgrade to -x on client.0"

diff --git a/suites/upgrade/client-upgrade/jewel-client-x/basic/2-workload/rbd_api_tests.yaml b/suites/upgrade/client-upgrade/jewel-client-x/basic/2-workload/rbd_api_tests.yaml
new file mode 100644 (file)
index 0000000..8939f3a
--- /dev/null
+++ b/suites/upgrade/client-upgrade/jewel-client-x/basic/2-workload/rbd_api_tests.yaml
@@ -0,0 +1,21 @@
+tasks:
+- exec:
+    client.0:
+    - "cp $(which ceph_test_librbd_api) $TESTDIR/ceph_test_librbd_api"
+- sequential:
+  - upgrade_workload
+- ceph: 
+- print: "**** done ceph"
+- exec:
+    client.0:
+    - "cp --force $TESTDIR/ceph_test_librbd_api $(which ceph_test_librbd_api)"
+    - "rm -rf $TESTDIR/ceph_test_librbd_api"
+- print: "**** done reverting to jewel ceph_test_librbd_api"
+- workunit:
+    branch: kraken
+    clients:
+      client.0:
+      - rbd/test_librbd_api.sh
+    env:
+      RBD_FEATURES: "13"
+- print: "**** done rbd/test_librbd_api.sh"

diff --git a/suites/upgrade/client-upgrade/jewel-client-x/basic/2-workload/rbd_cli_import_export.yaml b/suites/upgrade/client-upgrade/jewel-client-x/basic/2-workload/rbd_cli_import_export.yaml
new file mode 100644 (file)
index 0000000..545354f
--- /dev/null
+++ b/suites/upgrade/client-upgrade/jewel-client-x/basic/2-workload/rbd_cli_import_export.yaml
@@ -0,0 +1,13 @@
+tasks:
+- sequential:
+  - upgrade_workload
+- ceph: 
+- print: "**** done ceph"
+- workunit:
+    branch: jewel
+    clients:
+      client.0:
+      - rbd/import_export.sh
+    env:
+      RBD_CREATE_ARGS: --image-feature layering,exclusive-lock,object-map
+- print: "**** done rbd/import_export.sh"

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

diff --git a/suites/upgrade/client-upgrade/jewel-client-x/rbd/0-cluster/start.yaml b/suites/upgrade/client-upgrade/jewel-client-x/rbd/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..7ece9c1
--- /dev/null
+++ b/suites/upgrade/client-upgrade/jewel-client-x/rbd/0-cluster/start.yaml
@@ -0,0 +1,18 @@
+roles:
+- - mon.a
+  - mon.b
+  - mon.c
+  - osd.0
+  - osd.1
+  - osd.2
+  - client.0
+- - client.1
+overrides:
+  ceph:
+    log-whitelist:
+    - failed to encode map
+    fs: xfs
+    conf:
+      client:
+        rbd default features: 1
+

diff --git a/suites/upgrade/client-upgrade/jewel-client-x/rbd/1-install/jewel-client-x.yaml b/suites/upgrade/client-upgrade/jewel-client-x/rbd/1-install/jewel-client-x.yaml
new file mode 100644 (file)
index 0000000..4ce73a4
--- /dev/null
+++ b/suites/upgrade/client-upgrade/jewel-client-x/rbd/1-install/jewel-client-x.yaml
@@ -0,0 +1,11 @@
+tasks:
+- install:
+    branch: jewel
+    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
+- print: "**** done install jewel"
+- install.upgrade:
+   exclude_packages: ['ceph-test', 'ceph-test-dbg']
+   client.1:
+- print: "**** done install.upgrade to -x on client.0"
+- ceph:
+- print: "**** done ceph task"

diff --git a/suites/upgrade/client-upgrade/jewel-client-x/rbd/2-workload/rbd_notification_tests.yaml b/suites/upgrade/client-upgrade/jewel-client-x/rbd/2-workload/rbd_notification_tests.yaml
new file mode 100644 (file)
index 0000000..1fb6822
--- /dev/null
+++ b/suites/upgrade/client-upgrade/jewel-client-x/rbd/2-workload/rbd_notification_tests.yaml
@@ -0,0 +1,21 @@
+tasks:
+- workunit:
+    branch: jewel
+    clients:
+      client.0:
+        - rbd/notify_master.sh
+      client.1:
+        - rbd/notify_slave.sh
+    env:
+      RBD_FEATURES: "13"
+- print: "**** done rbd: old librbd -> new librbd"
+- workunit:
+    branch: jewel
+    clients:
+      client.0:
+        - rbd/notify_slave.sh
+      client.1:
+        - rbd/notify_master.sh
+    env:
+      RBD_FEATURES: "13"
+- print: "**** done rbd: new librbd -> old librbd"