summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-04-12 06:35:14 -0500
committerGitHub <noreply@github.com>2017-04-12 06:35:14 -0500
commit9ba1fde05566fb7ae188e2b06aef89e6bab723eb (patch)
treec2cb28ac4a1a57c10dc2d4269241facffa7e456b
parent5ffbb64bb6172a22392497d91424d45bc9b906a8 (diff)
parentdaebc9f0848ffd875ccfe9e2f0e6e919a4f83516 (diff)
downloadopenshift-9ba1fde05566fb7ae188e2b06aef89e6bab723eb.tar.gz
openshift-9ba1fde05566fb7ae188e2b06aef89e6bab723eb.tar.bz2
openshift-9ba1fde05566fb7ae188e2b06aef89e6bab723eb.tar.xz
openshift-9ba1fde05566fb7ae188e2b06aef89e6bab723eb.zip
Merge pull request #3757 from juanvallejo/jvallejo/skip-yum-update-check-on-fedora
Merged by openshift-bot
-rw-r--r--roles/openshift_health_checker/openshift_checks/package_availability.py4
-rw-r--r--roles/openshift_health_checker/test/package_availability_test.py14
2 files changed, 18 insertions, 0 deletions
diff --git a/roles/openshift_health_checker/openshift_checks/package_availability.py b/roles/openshift_health_checker/openshift_checks/package_availability.py
index 9891972a6..a7eb720fd 100644
--- a/roles/openshift_health_checker/openshift_checks/package_availability.py
+++ b/roles/openshift_health_checker/openshift_checks/package_availability.py
@@ -9,6 +9,10 @@ class PackageAvailability(NotContainerizedMixin, OpenShiftCheck):
name = "package_availability"
tags = ["preflight"]
+ @classmethod
+ def is_active(cls, task_vars):
+ return super(PackageAvailability, cls).is_active(task_vars) and task_vars["ansible_pkg_mgr"] == "yum"
+
def run(self, tmp, task_vars):
rpm_prefix = get_var(task_vars, "openshift", "common", "service_type")
group_names = get_var(task_vars, "group_names", default=[])
diff --git a/roles/openshift_health_checker/test/package_availability_test.py b/roles/openshift_health_checker/test/package_availability_test.py
index 25385339a..f7e916a46 100644
--- a/roles/openshift_health_checker/test/package_availability_test.py
+++ b/roles/openshift_health_checker/test/package_availability_test.py
@@ -3,6 +3,20 @@ import pytest
from openshift_checks.package_availability import PackageAvailability
+@pytest.mark.parametrize('pkg_mgr,is_containerized,is_active', [
+ ('yum', False, True),
+ ('yum', True, False),
+ ('dnf', True, False),
+ ('dnf', False, False),
+])
+def test_is_active(pkg_mgr, is_containerized, is_active):
+ task_vars = dict(
+ ansible_pkg_mgr=pkg_mgr,
+ openshift=dict(common=dict(is_containerized=is_containerized)),
+ )
+ assert PackageAvailability.is_active(task_vars=task_vars) == is_active
+
+
@pytest.mark.parametrize('task_vars,must_have_packages,must_not_have_packages', [
(
dict(openshift=dict(common=dict(service_type='openshift'))),