From 8fcdb0a73ca909ab84d0a2954251e8c264fbd95a Mon Sep 17 00:00:00 2001 From: Jordan Borean Date: Tue, 15 Jan 2019 17:26:03 +1000 Subject: [PATCH] ansible-test git: kill gpg-agent to remove locks (#50917) * ansible-test git: kill gpg-agent to remove locks * skip gpg-agent kill for OpenSUSE (cherry picked from commit 3db6b9b416f07ea2cda5e457f3592149b09881d3) --- test/integration/targets/git/tasks/gpg-verification.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/integration/targets/git/tasks/gpg-verification.yml b/test/integration/targets/git/tasks/gpg-verification.yml index 863aa327800..90d7022f4da 100644 --- a/test/integration/targets/git/tasks/gpg-verification.yml +++ b/test/integration/targets/git/tasks/gpg-verification.yml @@ -180,6 +180,10 @@ - git_verify is failed - git_verify.msg is match("Failed to verify GPG signature of commit/tag.+") +- 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 + - name: GPG-VERIFICATION | Remove GnuPG verification workdir file: path: "{{ git_gpg_workdir.path }}"