From: Vasu Kulkarni <vasu@redhat.com>
Date: Wed, 18 Nov 2015 19:03:35 +0000 (-0500)
Subject: Remove epel packages during downstream testing if present on the node
X-Git-Tag: 1.1.0~739^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F709%2Fhead;p=teuthology.git

Remove epel packages during downstream testing if present on the node

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
---

diff --git a/teuthology/task/install.py b/teuthology/task/install.py
index 975a3ca02..24deec029 100644
--- a/teuthology/task/install.py
+++ b/teuthology/task/install.py
@@ -760,6 +760,8 @@ def rh_install_pkgs(ctx, remote, installed_version):
     """
     pkgs = ['ceph-deploy']
     rh_version_check = {'0.94.1': '1.3.0', '0.94.3': '1.3.1'}
+    log.info("Remove any epel packages installed on node %s", remote.shortname)
+    remote.run(args=['sudo', 'yum', 'remove', run.Raw("leveldb xmlstarlet fcgi"), '-y'],check_status=False)
     for pkg in pkgs:
         log.info("Check if ceph-deploy is already installed on node %s", remote.shortname)
         remote.run(args=['sudo', 'yum', 'clean', 'metadata'])