WIP gpg fails if importing an existing key

internet2 · Jan 13, 2022 · 60f28c9 · 60f28c9
1 parent 30ae97a
commit 60f28c9
Showing 1 changed file with 1 addition and 2 deletions.
diff --git 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'
             }
         }