diff options
author | Michael Gugino <mgugino@redhat.com> | 2017-09-12 11:07:12 -0400 |
---|---|---|
committer | Michael Gugino <mgugino@redhat.com> | 2017-09-20 13:04:03 -0400 |
commit | 4b8f66c37b865c7be59310854f5f9bd3de3e01bb (patch) | |
tree | 0de1cd2d6b8710503e7f2a1dc6c8fa1271b46ca6 /roles/openshift_health_checker/test | |
parent | af580f808d78667bde54b88d4c33fca493828945 (diff) | |
download | openshift-4b8f66c37b865c7be59310854f5f9bd3de3e01bb.tar.gz openshift-4b8f66c37b865c7be59310854f5f9bd3de3e01bb.tar.bz2 openshift-4b8f66c37b865c7be59310854f5f9bd3de3e01bb.tar.xz openshift-4b8f66c37b865c7be59310854f5f9bd3de3e01bb.zip |
Cleanup old deployment types
Previously, openshift-ansible supported various
types of deployments using the variable "openshift_deployment_type"
Currently, openshift-ansible only supports two deployment types,
"origin" and "openshift-enterprise".
This commit removes all logic and references to deprecated
deployment types.
Diffstat (limited to 'roles/openshift_health_checker/test')
-rw-r--r-- | roles/openshift_health_checker/test/docker_image_availability_test.py | 35 |
1 files changed, 33 insertions, 2 deletions
diff --git a/roles/openshift_health_checker/test/docker_image_availability_test.py b/roles/openshift_health_checker/test/docker_image_availability_test.py index 6a7c16c7e..952fa9aa6 100644 --- a/roles/openshift_health_checker/test/docker_image_availability_test.py +++ b/roles/openshift_health_checker/test/docker_image_availability_test.py @@ -23,8 +23,6 @@ def task_vars(): @pytest.mark.parametrize('deployment_type, is_containerized, group_names, expect_active', [ ("origin", True, [], True), ("openshift-enterprise", True, [], True), - ("enterprise", True, [], False), - ("online", True, [], False), ("invalid", True, [], False), ("", True, [], False), ("origin", False, [], False), @@ -103,6 +101,39 @@ def test_all_images_unavailable(task_vars): assert "required Docker images are not available" in actual['msg'] +def test_no_known_registries(): + def execute_module(module_name=None, *_): + if module_name == "command": + return { + 'failed': True, + } + + return { + 'changed': False, + } + + def mock_known_docker_registries(): + return [] + + dia = DockerImageAvailability(execute_module, task_vars=dict( + openshift=dict( + common=dict( + service_type='origin', + is_containerized=False, + is_atomic=False, + ), + docker=dict(additional_registries=["docker.io"]), + ), + openshift_deployment_type="openshift-enterprise", + openshift_image_tag='latest', + group_names=['nodes', 'masters'], + )) + dia.known_docker_registries = mock_known_docker_registries + actual = dia.run() + assert actual['failed'] + assert "Unable to retrieve any docker registries." in actual['msg'] + + @pytest.mark.parametrize("message,extra_words", [ ( "docker image update failure", |