diff options
| author | Rick Elrod <rick@elrod.me> | 2020-09-23 20:05:38 -0500 |
|---|---|---|
| committer | Rick Elrod <rick@elrod.me> | 2020-09-24 13:13:35 -0500 |
| commit | ace7f247f2292c2aaf41b325f54174e9e68bda17 (patch) | |
| tree | ee4ee82a7d3c26da4cafe13c7a52ed97a92bd91c /test/integration | |
| parent | 39fae9320cae9de3d9fe79519e14a3b2fa98adcf (diff) | |
| download | ansible-ace7f247f2292c2aaf41b325f54174e9e68bda17.tar.gz | |
[docker_login] Fix changed status for newer docker
Change:
- Newer docker versions report the same message whether or not a logout
actually happened.
- Determine change status from looking at the config instead if we can.
- This also allows us to restore check_mode in logout and re-enable that
test.
Test Plan:
- CI, re-enabled tests
Tickets:
- Refs https://github.com/docker/cli/commit/6248f2fb6fa6c6035d7b94193a70b44ffd9b3c9e
Signed-off-by: Rick Elrod <rick@elrod.me>
Diffstat (limited to 'test/integration')
| -rw-r--r-- | test/integration/targets/docker-registry/tasks/tests/docker_login.yml | 16 | ||||
| -rw-r--r-- | test/integration/targets/setup_docker/tasks/Fedora.yml | 6 |
2 files changed, 13 insertions, 9 deletions
diff --git a/test/integration/targets/docker-registry/tasks/tests/docker_login.yml b/test/integration/targets/docker-registry/tasks/tests/docker_login.yml index 3f931ec777..30a20dbf3d 100644 --- a/test/integration/targets/docker-registry/tasks/tests/docker_login.yml +++ b/test/integration/targets/docker-registry/tasks/tests/docker_login.yml @@ -68,12 +68,12 @@ - login_3 is not changed - login_4 is not changed -#- name: Log out (check mode) -# docker_login: -# registry_url: "{{ registry_frontend_address }}" -# state: absent -# register: logout_1 -# check_mode: yes +- name: Log out (check mode) + docker_login: + registry_url: "{{ registry_frontend_address }}" + state: absent + register: logout_1 + check_mode: yes - name: Log out docker_login: @@ -94,10 +94,10 @@ register: logout_4 check_mode: yes -- name: Make sure that login worked +- name: Make sure that logout worked assert: that: - #- logout_1 is changed + - logout_1 is changed - logout_2 is changed - logout_3 is not changed - logout_4 is not changed diff --git a/test/integration/targets/setup_docker/tasks/Fedora.yml b/test/integration/targets/setup_docker/tasks/Fedora.yml index 9f52e8f144..5f71b849cb 100644 --- a/test/integration/targets/setup_docker/tasks/Fedora.yml +++ b/test/integration/targets/setup_docker/tasks/Fedora.yml @@ -1,3 +1,8 @@ +- name: Import GPG key + rpm_key: + key: https://download.docker.com/linux/fedora/gpg + state: present + - name: Add repository yum_repository: file: docker-ce @@ -6,7 +11,6 @@ baseurl: https://download.docker.com/linux/fedora/$releasever/$basearch/stable enabled: yes gpgcheck: yes - gpgkey: https://download.docker.com/linux/fedora/gpg - name: Update cache command: dnf makecache |