diff options
| author | Jordan Borean <jborean93@gmail.com> | 2019-02-18 21:30:31 +1000 |
|---|---|---|
| committer | Toshio Kuratomi <a.badger@gmail.com> | 2019-02-18 10:19:58 -0800 |
| commit | f66c006d8c95149e59e31f361cfc13955839b04e (patch) | |
| tree | 65a06304eb484fa89708e7e4c6b77c5e83904fd4 | |
| parent | 92e62a1bf1e3d35a4188fe777bc804017063ff8e (diff) | |
| download | ansible-f66c006d8c95149e59e31f361cfc13955839b04e.tar.gz | |
git: kill gpg-agent in tests on newer OpenSUSE hosts (#52476)
(cherry picked from commit bb0a69e0845e2bd34cb715c05b977e1a8b31cfe2)
| -rw-r--r-- | test/integration/targets/git/tasks/gpg-verification.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/integration/targets/git/tasks/gpg-verification.yml b/test/integration/targets/git/tasks/gpg-verification.yml index 94e39a931a..143b7e55a3 100644 --- a/test/integration/targets/git/tasks/gpg-verification.yml +++ b/test/integration/targets/git/tasks/gpg-verification.yml @@ -182,7 +182,7 @@ - name: GPG-VERIFICATION | Stop gpg-agent so we can remove any locks on the GnuPG dir command: gpgconf --kill gpg-agent - when: ansible_os_family != 'Suse' # OpenSUSE ships with an older version of gpg-agent that doesn't support this + when: ansible_os_family != 'Suse' or ansible_distribution_version != '42.3' # OpenSUSE 42.3 ships with an older version of gpg-agent that doesn't support this environment: GNUPGHOME: "{{ git_gpg_gpghome }}" |