From: Yuri Weinstein <yweinste@redhat.com>
Date: Tue, 15 Nov 2016 17:25:14 +0000 (+0000)
Subject: Added excluded packadges "'libcephfs-devel','libcephfs-dev'"
X-Git-Tag: v11.1.1~58^2^2~38^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cae569ab480c9989b1cbeb40bffb2ad4885361d2;p=ceph.git

Added excluded packadges "'libcephfs-devel','libcephfs-dev'"

Fixes http://tracker.ceph.com/issues/17902
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>

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

diff --git a/suites/upgrade/jewel-x/parallel/1-jewel-install/jewel.yaml b/suites/upgrade/jewel-x/parallel/1-jewel-install/jewel.yaml
index 9ec65d6ff8f..6fba9555c6f 100644
--- a/suites/upgrade/jewel-x/parallel/1-jewel-install/jewel.yaml
+++ b/suites/upgrade/jewel-x/parallel/1-jewel-install/jewel.yaml
@@ -6,7 +6,7 @@ meta:
 tasks:
 - install:
     branch: jewel
-    exclude_packages: ['ceph-mgr','libcephfs2']
+    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
 - print: "**** done installing jewel"
 - ceph:
 - print: "**** done ceph"
diff --git a/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml b/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml
index 802b1dbd162..9f803a077e3 100644
--- a/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml
+++ b/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml
@@ -43,7 +43,7 @@ tasks:
 - print: "****  v10.2.0 about to install"
 - install:
     tag: v10.2.0
-    exclude_packages: ['ceph-mgr']
+    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
 - print: "**** done v10.2.0 install"
 - ceph:
    fs: xfs
@@ -52,12 +52,11 @@ tasks:
    - workload
 - print: "**** done workload v10.2.0"
 - install.upgrade:
+    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
     mon.a:
       branch: jewel
-      exclude_packages: ['ceph-mgr']
     mon.b:
       branch: jewel
-      exclude_packages: ['ceph-mgr']
     # Note that client.a IS NOT upgraded at this point
     #client.1:
       #branch: jewel
@@ -66,9 +65,9 @@ tasks:
    - upgrade-sequence_jewel
 - print: "**** done parallel jewel branch"
 - install.upgrade:
+    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
     client.1:
       branch: jewel
-      exclude_packages: ['ceph-mgr']
 - print: "**** done branch: jewel install.upgrade on client.1"
 - install.upgrade:
     mon.a:
diff --git a/suites/upgrade/jewel-x/stress-split/1-jewel-install/jewel.yaml b/suites/upgrade/jewel-x/stress-split/1-jewel-install/jewel.yaml
index 9408bf894dd..87bc11f451c 100644
--- a/suites/upgrade/jewel-x/stress-split/1-jewel-install/jewel.yaml
+++ b/suites/upgrade/jewel-x/stress-split/1-jewel-install/jewel.yaml
@@ -3,7 +3,7 @@ meta:
 tasks:
 - install:
     branch: jewel
-    exclude_packages: ['ceph-mgr','libcephfs2']
+    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
 - print: "**** done install jewel"
 - ceph:
 - print: "**** done ceph"