Skip to content

Commit 1fadbb0

Browse files
committed
HSEARCH-5152 Use env variable name instead of the passphrase in GPG configuration
(cherry picked from commit d99fe16)
1 parent f54c8cd commit 1fadbb0

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

ci/release/Jenkinsfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,9 @@ pipeline {
6868
mavenLocalRepo: env.WORKSPACE_TMP + '/.m2repository') {
6969
configFileProvider([configFile(fileId: 'release.config.ssh', targetLocation: env.HOME + '/.ssh/config'),
7070
configFile(fileId: 'release.config.ssh.knownhosts', targetLocation: env.HOME + '/.ssh/known_hosts')]) {
71+
// using MAVEN_GPG_PASSPHRASE (the default env variable name for passphrase in maven gpg plugin)
7172
withCredentials([file(credentialsId: 'release.gpg.private-key', variable: 'RELEASE_GPG_PRIVATE_KEY_PATH'),
72-
string(credentialsId: 'release.gpg.passphrase', variable: 'RELEASE_GPG_PASSPHRASE')]) {
73+
string(credentialsId: 'release.gpg.passphrase', variable: 'MAVEN_GPG_PASSPHRASE')]) {
7374
sshagent(['ed25519.Hibernate-CI.github.com', 'hibernate.filemgmt.jboss.org', 'hibernate-ci.frs.sourceforge.net']) {
7475
sh 'cat $HOME/.ssh/config'
7576
sh 'git clone https://github.com/hibernate/hibernate-release-scripts.git'

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@
569569
<configuration>
570570
<skip>${deploy.skip}</skip>
571571
<homedir>${env.RELEASE_GPG_HOMEDIR}</homedir>
572-
<passphrase>${env.RELEASE_GPG_PASSPHRASE}</passphrase>
572+
<bestPractices>true</bestPractices>
573573
</configuration>
574574
</execution>
575575
</executions>

0 commit comments

Comments
 (0)