From e9d618952090f2ad1d0156f06508a5ccf837c705 Mon Sep 17 00:00:00 2001
From: Chad Redman <chad_redman@unc.edu>
Date: Thu, 13 Jan 2022 01:42:01 -0500
Subject: [PATCH] WIP gpg fails if importing an existing key

---
 Jenkinsfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b3a0b0a..9cc79e3 100644
--- 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'
             }
         }