diff options
| author | Miciah Masters <miciah.masters@gmail.com> | 2017-11-06 08:58:36 -0500 |
|---|---|---|
| committer | Miciah Dashiel Butler Masters <mmasters@redhat.com> | 2017-11-06 11:04:17 -0500 |
| commit | 5aeb4d1f07a1d73e3f3880b7f585f545ee034003 (patch) | |
| tree | 4701de1b708a8890f24de7e3437f33079b2f5a08 | |
| parent | 5efcf4a2f7e9c2f21c6f9f86dc08f12fd5f56290 (diff) | |
| download | openshift-5aeb4d1f07a1d73e3f3880b7f585f545ee034003.tar.gz openshift-5aeb4d1f07a1d73e3f3880b7f585f545ee034003.tar.bz2 openshift-5aeb4d1f07a1d73e3f3880b7f585f545ee034003.tar.xz openshift-5aeb4d1f07a1d73e3f3880b7f585f545ee034003.zip | |
openshift_checks: Add OVS versions for OCP 3.7
Update the ovs_version check with the allowed Open vSwitch versions for OCP
3.7.
Add OVS 2.8 to the allowed versions for OCP 3.6 as well.
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1509163
3 files changed, 6 insertions, 3 deletions
diff --git a/roles/openshift_health_checker/openshift_checks/ovs_version.py b/roles/openshift_health_checker/openshift_checks/ovs_version.py index 416805c4d..0cad19842 100644 --- a/roles/openshift_health_checker/openshift_checks/ovs_version.py +++ b/roles/openshift_health_checker/openshift_checks/ovs_version.py @@ -16,7 +16,8 @@ class OvsVersion(NotContainerizedMixin, OpenShiftCheck): tags = ["health"] openshift_to_ovs_version = { - "3.6": ["2.6", "2.7"], + "3.7": ["2.6", "2.7", "2.8"], + "3.6": ["2.6", "2.7", "2.8"], "3.5": ["2.6", "2.7"], "3.4": "2.4", } diff --git a/roles/openshift_health_checker/openshift_checks/package_version.py b/roles/openshift_health_checker/openshift_checks/package_version.py index 2f09b22fc..13a91dadf 100644 --- a/roles/openshift_health_checker/openshift_checks/package_version.py +++ b/roles/openshift_health_checker/openshift_checks/package_version.py @@ -16,7 +16,8 @@ class PackageVersion(NotContainerizedMixin, OpenShiftCheck): openshift_to_ovs_version = { (3, 4): "2.4", (3, 5): ["2.6", "2.7"], - (3, 6): ["2.6", "2.7"], + (3, 6): ["2.6", "2.7", "2.8"], + (3, 7): ["2.6", "2.7", "2.8"], } openshift_to_docker_version = { diff --git a/roles/openshift_health_checker/test/ovs_version_test.py b/roles/openshift_health_checker/test/ovs_version_test.py index 5a82a43bf..6f0457549 100644 --- a/roles/openshift_health_checker/test/ovs_version_test.py +++ b/roles/openshift_health_checker/test/ovs_version_test.py @@ -38,8 +38,9 @@ def test_invalid_openshift_release_format(): @pytest.mark.parametrize('openshift_release,expected_ovs_version', [ + ("3.7", ["2.6", "2.7", "2.8"]), ("3.5", ["2.6", "2.7"]), - ("3.6", ["2.6", "2.7"]), + ("3.6", ["2.6", "2.7", "2.8"]), ("3.4", "2.4"), ("3.3", "2.4"), ("1.0", "2.4"), |