]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
Update rh_version supported in downstream
authorVasu Kulkarni <vasu@redhat.com>
Thu, 17 Mar 2016 02:53:53 +0000 (22:53 -0400)
committerVasu Kulkarni <vasu@redhat.com>
Thu, 17 Mar 2016 02:53:53 +0000 (22:53 -0400)
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
teuthology/task/install.py

index a8661ba5b632054018d766762dd14b95a84b2c97..ebdea14547f3cf1a1a1ed7f726895322483d0225 100644 (file)
@@ -688,7 +688,7 @@ def rh_install(ctx, config):
     :param config: the config dict
     """
     version = config['rhbuild']
-    rh_versions = ['1.3.0', '1.3.1']
+    rh_versions = ['1.3.0', '1.3.1', '1.3.2', '2.0']
     if version in rh_versions:
         log.info("%s is a supported version", version)
     else:
@@ -732,7 +732,8 @@ def rh_install_pkgs(ctx, remote, installed_version):
     :param remote: the teuthology.orchestra.remote.Remote object
     """
     pkgs = ['ceph-deploy']
-    rh_version_check = {'0.94.1': '1.3.0', '0.94.3': '1.3.1'}
+    rh_version_check = {'0.94.1': '1.3.0', '0.94.3': '1.3.1',
+                        '0.94.5': '1.3.2', '10.0.4': '2.0'}
     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: