Skip to content

Commit ef23aec

Browse files
committed
feat: change Jenkins GPG key from 2023 to 2026 - jenkins-infra/helpdesk#4922
Signed-off-by: Damien Duportal <damien.duportal@gmail.com>
1 parent f25052e commit ef23aec

File tree

8 files changed

+16
-13
lines changed

8 files changed

+16
-13
lines changed

Jenkinsfile.d/core/package

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ pipeline {
9191
AZURE_VAULT_CLIENT_SECRET = credentials('azure-vault-client-secret')
9292
AZURE_VAULT_TENANT_ID = credentials('azure-vault-tenant-id')
9393
GPG_FILE = 'jenkins-release.gpg'
94-
GPG_PASSPHRASE = credentials('release-gpg-passphrase-2023')
94+
GPG_PASSPHRASE = credentials('release-gpg-passphrase-2026')
9595
// Using HTTPS with no credentials - https://github.com/jenkins-infra/helpdesk/issues/4909 - need a GH app if rate limited or need to write things to git
9696
PACKAGING_GIT_REPOSITORY = 'https://github.com/jenkinsci/packaging.git'
9797
PACKAGING_GIT_BRANCH = 'master'

Jenkinsfile.d/core/release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ pipeline {
5454
AZURE_VAULT_CLIENT_ID = credentials('azure-vault-client-id')
5555
AZURE_VAULT_CLIENT_SECRET = credentials('azure-vault-client-secret')
5656
AZURE_VAULT_TENANT_ID = credentials('azure-vault-tenant-id')
57-
GPG_PASSPHRASE = credentials('release-gpg-passphrase-2023')
57+
GPG_PASSPHRASE = credentials('release-gpg-passphrase-2026')
5858
GPG_FILE = 'jenkins-release.gpg'
5959
MAVEN_REPOSITORY_USERNAME = credentials('maven-repository-username')
6060
MAVEN_REPOSITORY_PASSWORD = credentials('maven-repository-password')

env/package.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,6 @@ export DEB_WEBDIR=${BASE_PKG_DIR}/debian${RELEASELINE}
1717
WEBSERVER=https://pkg.jenkins.io
1818
export RPM_URL=${WEBSERVER}/rpm${RELEASELINE}
1919
export DEB_URL=${WEBSERVER}/debian${RELEASELINE}
20+
21+
# Exposed GPG public key
22+
export GPG_PUBLIC_KEY_FILE="jenkins.io-2026.key"

profile.d/experimental

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ RELEASE_GIT_REPOSITORY=git@github.com:olblak/jenkins.git
33
JENKINS_VERSION=latest
44
GIT_EMAIL=66998184+jenkins-release-bot@users.noreply.github.com
55
GIT_NAME="Jenkins Release Bot"
6-
GPG_KEYNAME="63667EE74BBA1F0A08A698725BA31D57EF5975CA"
7-
GPG_VAULT_NAME="jenkins-release-pgp-2023"
6+
GPG_KEYNAME="5E386EADB55F01504CAE8BCF7198F4B714ABFC68"
7+
GPG_VAULT_NAME="jenkins-release-pgp-2026"
88
MAVEN_REPOSITORY_URL='https://repo.jenkins-ci.org'
99
MAVEN_REPOSITORY_NAME=olblak-sandbox
1010
MAVEN_PUBLIC_JENKINS_REPOSITORY_MIRROR_URL='https://repo.jenkins-ci.org/public/'

profile.d/security

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ RELEASE_GIT_REPOSITORY=git@github.com:jenkinsci-cert/jenkins.git
99
#
1010
GIT_EMAIL=66998184+jenkins-release-bot@users.noreply.github.com
1111
GIT_NAME="Jenkins Release Bot"
12-
GPG_KEYNAME="63667EE74BBA1F0A08A698725BA31D57EF5975CA"
13-
GPG_VAULT_NAME="jenkins-release-pgp-2023"
12+
GPG_KEYNAME="5E386EADB55F01504CAE8BCF7198F4B714ABFC68"
13+
GPG_VAULT_NAME="jenkins-release-pgp-2026"
1414
MAVEN_REPOSITORY_URL=https://repo.jenkins-ci.org
1515
MAVEN_PUBLIC_JENKINS_REPOSITORY_MIRROR_URL='https://repo.jenkins-ci.org/public/'
1616
SIGN_ALIAS=jenkins

profile.d/stable

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ RELEASE_GIT_BRANCH=master
66
RELEASE_GIT_REPOSITORY=git@github.com:jenkinsci/jenkins.git
77
GIT_EMAIL=66998184+jenkins-release-bot@users.noreply.github.com
88
GIT_NAME="Jenkins Release Bot"
9-
GPG_KEYNAME="63667EE74BBA1F0A08A698725BA31D57EF5975CA"
10-
GPG_VAULT_NAME="jenkins-release-pgp-2023"
9+
GPG_KEYNAME="5E386EADB55F01504CAE8BCF7198F4B714ABFC68"
10+
GPG_VAULT_NAME="jenkins-release-pgp-2026"
1111
MAVEN_REPOSITORY_URL='https://repo.jenkins-ci.org'
1212
MAVEN_REPOSITORY_NAME=releases
1313
MAVEN_PUBLIC_JENKINS_REPOSITORY_MIRROR_URL='https://repo.jenkins-ci.org/public/'

profile.d/stable-rc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ RELEASE_GIT_BRANCH=master
66
RELEASE_GIT_REPOSITORY=git@github.com:jenkinsci/jenkins.git
77
GIT_EMAIL=66998184+jenkins-release-bot@users.noreply.github.com
88
GIT_NAME="Jenkins Release Bot"
9-
GPG_KEYNAME="63667EE74BBA1F0A08A698725BA31D57EF5975CA"
10-
GPG_VAULT_NAME="jenkins-release-pgp-2023"
9+
GPG_KEYNAME="5E386EADB55F01504CAE8BCF7198F4B714ABFC68"
10+
GPG_VAULT_NAME="jenkins-release-pgp-2026"
1111
MAVEN_REPOSITORY_URL='https://repo.jenkins-ci.org'
1212
MAVEN_REPOSITORY_NAME=snapshots
1313
SIGN_ALIAS=jenkins
@@ -16,7 +16,7 @@ SIGN_ALIAS=jenkins
1616
# but instead looking at the value for metadata.versioning.latest from the maven-metadata.xml
1717
# this approach doesn't allow to use the same maven-repository than weekly releases.
1818
#
19-
JENKINS_VERSION=latest
19+
JENKINS_VERSION=latest
2020

2121
# Used by jenkinsci/packaging
2222
RELEASELINE=-stable-rc

profile.d/weekly

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ RELEASE_GIT_BRANCH=master
66
RELEASE_GIT_REPOSITORY=git@github.com:jenkinsci/jenkins.git
77
GIT_EMAIL=66998184+jenkins-release-bot@users.noreply.github.com
88
GIT_NAME="Jenkins Release Bot"
9-
GPG_KEYNAME="63667EE74BBA1F0A08A698725BA31D57EF5975CA"
10-
GPG_VAULT_NAME="jenkins-release-pgp-2023"
9+
GPG_KEYNAME="5E386EADB55F01504CAE8BCF7198F4B714ABFC68"
10+
GPG_VAULT_NAME="jenkins-release-pgp-2026"
1111
MAVEN_REPOSITORY_URL='https://repo.jenkins-ci.org'
1212
MAVEN_REPOSITORY_NAME=releases
1313
MAVEN_PUBLIC_JENKINS_REPOSITORY_MIRROR_URL='https://repo.jenkins-ci.org/public/'

0 commit comments

Comments
 (0)