Merge pull request #1277 from ceph/wip-exclude-upgrade-clients

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

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

suites/upgrade/client-upgrade/firefly-client-x/basic/0-cluster/start.yaml

@@ -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

suites/upgrade/client-upgrade/firefly-client-x/basic/1-install/firefly-client-x.yaml

@@ -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"

suites/upgrade/client-upgrade/firefly-client-x/basic/2-workload/rbd_cli_import_export.yaml

@@ -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"

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

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:

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

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']

suites/upgrade/client-upgrade/infernalis-client-x/rbd/1-install/infernalis-client-x.yaml

@@ -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"

suites/upgrade/client-upgrade/jewel-client-x/basic/0-cluster/start.yaml

@@ -10,3 +10,4 @@ overrides:
   ceph:
     log-whitelist:
     - failed to encode map
+    fs: xfs

suites/upgrade/client-upgrade/jewel-client-x/basic/1-install/jewel-client-x.yaml

@@ -1,8 +1,8 @@
 tasks:
 - install:
-    branch: infernalis 
+    branch: jewel 
-    exclude_packages: ['ceph-mgr']
+    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
-- print: "**** done install infernalis"
+- print: "**** done install jewel"
 upgrade_workload:
   sequential:
   - install.upgrade:

suites/upgrade/client-upgrade/jewel-client-x/basic/2-workload/rbd_api_tests.yaml

@@ -10,9 +10,9 @@ tasks:
     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"
+- print: "**** done reverting to jewel ceph_test_librbd_api"
 - workunit:
-    branch: infernalis
+    branch: kraken
     clients:
       client.0:
       - rbd/test_librbd_api.sh

suites/upgrade/client-upgrade/jewel-client-x/basic/2-workload/rbd_cli_import_export.yaml

@@ -4,7 +4,7 @@ tasks:
 - ceph: 
 - print: "**** done ceph"
 - workunit:
-    branch: infernalis
+    branch: jewel
     clients:
       client.0:
       - rbd/import_export.sh

suites/upgrade/client-upgrade/jewel-client-x/rbd/0-cluster/start.yaml

@@ -11,6 +11,8 @@ overrides:
   ceph:
     log-whitelist:
     - failed to encode map
+    fs: xfs
     conf:
       client:
         rbd default features: 1
+

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"

suites/upgrade/client-upgrade/jewel-client-x/rbd/2-workload/rbd_notification_tests.yaml

@@ -1,6 +1,6 @@
 tasks:
 - workunit:
-    branch: infernalis
+    branch: jewel
     clients:
       client.0:
         - rbd/notify_master.sh
@@ -10,7 +10,7 @@ tasks:
       RBD_FEATURES: "13"
 - print: "**** done rbd: old librbd -> new librbd"
 - workunit:
-    branch: infernalis
+    branch: jewel
     clients:
       client.0:
         - rbd/notify_slave.sh