diff options
| author | Sloane Hertel <19572925+s-hertel@users.noreply.github.com> | 2022-06-08 11:00:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-08 10:00:11 -0500 |
| commit | 68c2f09ae8968b47e38b836aff40e8f06c0b40a5 (patch) | |
| tree | ab45dd5eafa3b868c92639f86e3b4e810eede77d | |
| parent | 6291280ef8af4993f45e970ee07744f0e849083f (diff) | |
| download | ansible-68c2f09ae8968b47e38b836aff40e8f06c0b40a5.tar.gz | |
[2.13] fix ansible-galaxy-collection integration test (#77992)
* ansible-galaxy-collection - use --pinentry-mode loopback for gpg key revocation (#77967)
(cherry picked from commit 1706d35fc476e36fcced25435c2f1c2401536376)
* fix ansible-galaxy-collection test with revoked key (#77989)
* Remove unnecessary gpg passphrase
(cherry picked from commit a43112290a704294df7154d7ddd7dc624b72251f)
3 files changed, 2 insertions, 4 deletions
diff --git a/test/integration/targets/ansible-galaxy-collection/library/setup_collections.py b/test/integration/targets/ansible-galaxy-collection/library/setup_collections.py index adefba0575..58ec9b2a51 100644 --- a/test/integration/targets/ansible-galaxy-collection/library/setup_collections.py +++ b/test/integration/targets/ansible-galaxy-collection/library/setup_collections.py @@ -182,8 +182,6 @@ def sign_manifest(signature_path, manifest_path, module, collection_setup_result "--pinentry-mode", "loopback", "--yes", - "--passphrase", - "SECRET", "--homedir", module.params['signature_dir'], "--detach-sign", diff --git a/test/integration/targets/ansible-galaxy-collection/tasks/revoke_gpg_key.yml b/test/integration/targets/ansible-galaxy-collection/tasks/revoke_gpg_key.yml index a766d8ea60..7a49eeed57 100644 --- a/test/integration/targets/ansible-galaxy-collection/tasks/revoke_gpg_key.yml +++ b/test/integration/targets/ansible-galaxy-collection/tasks/revoke_gpg_key.yml @@ -1,6 +1,6 @@ - name: generate revocation certificate expect: - command: "gpg --homedir {{ gpg_homedir }} --output {{ gpg_homedir }}/revoke.asc --gen-revoke {{ fingerprint }}" + command: "gpg --homedir {{ gpg_homedir }} --pinentry-mode loopback --output {{ gpg_homedir }}/revoke.asc --gen-revoke {{ fingerprint }}" responses: "Create a revocation certificate for this key": "y" "Please select the reason for the revocation": "0" diff --git a/test/integration/targets/ansible-galaxy-collection/tasks/setup_gpg.yml b/test/integration/targets/ansible-galaxy-collection/tasks/setup_gpg.yml index 93d532f673..ddc4d8a6b0 100644 --- a/test/integration/targets/ansible-galaxy-collection/tasks/setup_gpg.yml +++ b/test/integration/targets/ansible-galaxy-collection/tasks/setup_gpg.yml @@ -12,7 +12,7 @@ register: user - name: generate key for user with gpg - command: "gpg --no-tty --homedir {{ gpg_homedir }} --passphrase SECRET --pinentry-mode loopback --quick-gen-key {{ user.stdout }} default default" + command: "gpg --no-tty --homedir {{ gpg_homedir }} --passphrase '' --pinentry-mode loopback --quick-gen-key {{ user.stdout }} default default" - name: list gpg keys for user command: "gpg --no-tty --homedir {{ gpg_homedir }} --list-keys {{ user.stdout }}" |