From 6e557f730af0544045577015547525aa31225bf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ely=C3=A9zer=20Mendes=20Rezende?= Date: Tue, 12 May 2015 17:58:19 -0300 Subject: [PATCH] Add workaround for Java on RHEL 6.6 This workaround is needed in order to install downstream on RHEL 6.6 without getting an error. If Java is not installed will be selected the 1.8.0 one which make the build fail, but the 1.7.0 will make it work properly. --- automation_tools/__init__.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/automation_tools/__init__.py b/automation_tools/__init__.py index 42d67aa7d..ec04a52bf 100644 --- a/automation_tools/__init__.py +++ b/automation_tools/__init__.py @@ -721,6 +721,13 @@ def downstream_install(admin_password=None, run_katello_installer=True): remote_path='/etc/yum.repos.d/satellite.repo') satellite_repo.close() + info = distro_info() + if info == ('rhel', 6, 6): + # For default java-1.8.0-openjdk will be installed on RHEL 6.6 but it + # makes the katello-installer fail. Install java-1.7.0-openjdk which is + # the recommended version for RHEL 6.6. + run('yum install -y java-1.7.0-openjdk') + # Install required packages for the installation run('yum install -y katello')