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' } }