commit b5c74c725d688b1c48d695b017dfdd442630dbb9
author Dmitry Pyzhov <dpyzhov@mirantis.com> Mon Dec 17 22:08:50 2018 +0300
committer Dmitry Pyzhov <dpyzhov@mirantis.com> Mon Dec 17 22:08:50 2018 +0300
tree 34078e6c65d6b4372385a2c81e79a264b33a31ef
parent 089fb4f658bc43d59bb07960dd485b7947ea3d97

Fix failure of gpg key creation in case of empty RequesterEmail

Change-Id: I68b77848ee692757a805efc0b4c6fe056747df67

generate-cookiecutter-products.groovy

diff --git a/generate-cookiecutter-products.groovy b/generate-cookiecutter-products.groovy
index c56f1a1..9df7611 100644
--- a/generate-cookiecutter-products.groovy
+++ b/generate-cookiecutter-products.groovy
@@ -137,7 +137,7 @@
                 withEnv(["GNUPGHOME=${env.WORKSPACE}/gpghome"]) {
                     if (context['secrets_encryption_enabled'] == 'True') {
                         sh "mkdir gpghome; chmod 700 gpghome"
-                        def secretKeyID = RequesterEmail
+                        def secretKeyID = RequesterEmail ?: "salt@${context['cluster_domain']}".toString()
                         if (!context.get('secrets_encryption_private_key')) {
                             def batchData = """
                                 Key-Type: 1