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

---
 Jenkinsfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 0b439b5..b3a0b0a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,12 +10,11 @@ def tag_pattern = /^(\d+\.\d+\.\w+)$/
 def grouper_src_branch = "GROUPER_RELEASE_${git_tag}"
 
 node('docker') {
-    sh 'env | sort'
 
     if (git_tag ==~ tag_pattern ) {
         stage("PgpImport") {
             withCredentials([file(credentialsId: gpg_cred_id, variable: 'GPG_KEYS')]) {
-                sh 'gpg --keyring=pubring.gpg --no-default-keyring --import $GPG_KEYS'
+                sh 'gpg --merge --keyring=pubring.gpg --no-default-keyring --import $GPG_KEYS'
             }
         }