diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-10-03 18:50:10 -0400 |
|---|---|---|
| committer | Luke Meyer <lmeyer@redhat.com> | 2017-10-06 15:48:13 -0400 |
| commit | 78639f0217d4027bf2d5542473562a1634f92ba8 (patch) | |
| tree | 28f5a05b15fd8df58b5b73705036fb3cf964606f /roles/openshift_health_checker/test/action_plugin_test.py | |
| parent | 707be43d8ed091612ae1cf7e0f44a3b5598d402a (diff) | |
| download | openshift-78639f0217d4027bf2d5542473562a1634f92ba8.tar.gz openshift-78639f0217d4027bf2d5542473562a1634f92ba8.tar.bz2 openshift-78639f0217d4027bf2d5542473562a1634f92ba8.tar.xz openshift-78639f0217d4027bf2d5542473562a1634f92ba8.zip | |
docker_image_availability: credentials to skopeo
Currently, docker_image_availability health_check
does not support authenticated registries.
This commit adds the '--creds=' option to skopeo
if needed to support authentication credentials.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1316341
Some other fixes to handle docker config better:
Should now account properly for blocked registries, insecure registries,
multiple additional registries, and oreg_url registry with or without credentials.
Output on failure should be clearer about what was tried.
Fixed a bug in the action_plugin_test exposed by these changes.
Diffstat (limited to 'roles/openshift_health_checker/test/action_plugin_test.py')
| -rw-r--r-- | roles/openshift_health_checker/test/action_plugin_test.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/roles/openshift_health_checker/test/action_plugin_test.py b/roles/openshift_health_checker/test/action_plugin_test.py index f14887303..40ad27d5d 100644 --- a/roles/openshift_health_checker/test/action_plugin_test.py +++ b/roles/openshift_health_checker/test/action_plugin_test.py @@ -94,6 +94,7 @@ def skipped(result): {}, ]) def test_action_plugin_missing_openshift_facts(plugin, task_vars, monkeypatch): + monkeypatch.setattr(plugin, 'load_known_checks', lambda *_: {}) monkeypatch.setattr('openshift_health_check.resolve_checks', lambda *args: ['fake_check']) result = plugin.run(tmp=None, task_vars=task_vars) |