From a17d9f1cc69a7efbc7aa8c65cac9c8f4c18e5c69 Mon Sep 17 00:00:00 2001 From: Jordan Borean Date: Mon, 18 Feb 2019 21:30:31 +1000 Subject: [PATCH] git: kill gpg-agent in tests on newer OpenSUSE hosts (#52476) (cherry picked from commit bb0a69e0845e2bd34cb715c05b977e1a8b31cfe2) --- test/integration/targets/git/tasks/gpg-verification.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 }}"