WIP gpg fails if importing an existing key

internet2 · Jan 13, 2022 · e9d6189 · e9d6189
1 parent 60f28c9
commit e9d6189
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -14,7 +14,8 @@ node('docker') {
     if (git_tag ==~ tag_pattern ) {
         stage("PgpImport") {
             withCredentials([file(credentialsId: gpg_cred_id, variable: 'GPG_KEYS')]) {
-                sh 'gpg --merge --keyring=pubring.gpg --no-default-keyring --import $GPG_KEYS'
+                sh 'gpg --version'
+                sh 'gpg --keyring=pubring.gpg --no-default-keyring --import $GPG_KEYS || true'
             }
         }