commit 9007296ec45ed6eec11e579531ddfb18054c9d6b
author Vladimir Khlyunev <vkhlyunev@mirantis.com> Mon Jan 25 19:19:48 2021 +0400
committer Vladimir Khlyunev <vkhlyunev@mirantis.com> Mon Jan 25 15:22:52 2021 +0000
tree d1f08bd6e3d78b2cbc1a5965b220359d40956ac4
parent f226ece98b980b82d5ad8bceb0e09dcaec5d5ab5

Use batch gpg import if key is defined

Model designer passes gpg key to model generaion
but gpg tool couldn't import it without --batch parameter

Closes-bug: PROD-36081
Change-Id: I99c2246034df53aef99c66dd9327a2d634dde10b

generate-cookiecutter-products.groovy

diff --git a/generate-cookiecutter-products.groovy b/generate-cookiecutter-products.groovy
index 90af5c1..98107b8 100644
--- a/generate-cookiecutter-products.groovy
+++ b/generate-cookiecutter-products.groovy
@@ -205,7 +205,7 @@
                             sh "gpg --export-secret-key -a ${secretKeyID} > gpgkey.asc"
                         } else {
                             writeFile file: 'gpgkey.asc', text: context['secrets_encryption_private_key']
-                            sh "gpg --import gpgkey.asc"
+                            sh "gpg --batch --import gpgkey.asc"
                             secretKeyID = sh(returnStdout: true, script: 'gpg --list-secret-keys --with-colons | grep -E "^sec" | awk -F: \'{print \$5}\'').trim()
                         }
                         context['secrets_encryption_key_id'] = secretKeyID