upgrade/client-upgrades: exclude ceph-mgr from old installs

Signed-off-by: Sage Weil <sage@redhat.com>

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
index 39430daa0881d8384b289acf04e87c5db99ee405..471412d0d9627082424a36e0afd4920036bbf326 100644 (file)
--- 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
@@ -1,6 +1,7 @@
 tasks:
 - install:
-   branch: firefly 
+    branch: firefly
+    exclude_packages: ['ceph-mgr']
 - print: "**** done install firefly"
 - install.upgrade:
    exclude_packages: ['ceph-test', 'ceph-test-dbg']

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 6a4eb998763fa3c40707a95a9273b19c3e5e0cce..4fa180b22a02544ed446c2a0abb68f2d262570ab 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,6 +1,7 @@
 tasks:
 - install:
     branch: hammer 
+    exclude_packages: ['ceph-mgr']
 - print: "**** done install hammer"
 upgrade_workload:
   sequential:

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 b261e5467ec2809daf36af1c5b84110a055ac925..54195b0507a6812da993b8d32c30cfc34d9c41db 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,6 +1,7 @@
 tasks:
 - install:
-   branch: hammer
+    branch: hammer
+    exclude_packages: ['ceph-mgr']
 - print: "**** done install hammer"
 - install.upgrade:
    exclude_packages: ['ceph-test', 'ceph-test-dbg']

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
index b1ea2c47d1266d88b2fff19a51daed50b5aafe51..1b71ee2050609bff87b03c283d77d8cad3e2e702 100644 (file)
--- 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
@@ -1,6 +1,7 @@
 tasks:
 - install:
     branch: infernalis 
+    exclude_packages: ['ceph-mgr']
 - print: "**** done install infernalis"
 upgrade_workload:
   sequential:

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
index 80052e0301889ef4bb128805e21dcd4ca07bc3bc..9e5daead4bcd3f4a6b2a9a9ea301dfbfcca5a862 100644 (file)
--- 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
@@ -1,6 +1,7 @@
 tasks:
 - install:
-   branch: infernalis
+    branch: infernalis
+    exclude_packages: ['ceph-mgr']
 - print: "**** done install infernalis"
 - install.upgrade:
    exclude_packages: ['ceph-test', 'ceph-test-dbg']