Skip to content

fix(package,infra-agent-health) use HTTPS instead of SSH to clone jenkinsci/packaging #817

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dduportal merged 3 commits into from
Dec 15, 2025
Merged

fix(package,infra-agent-health) use HTTPS instead of SSH to clone jenkinsci/packaging #817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9c402a
fix(package) use HTTPS instead of SSH to clone jenkinsci/packaging - …
dduportal Dec 15, 2025
2250712
Minor phrasing fix 1
MarkEWaite Dec 15, 2025
e659066
Minor phrasing fix 2
MarkEWaite Dec 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Jenkinsfile.d/core/package
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ pipeline {
AZURE_VAULT_TENANT_ID = credentials('azure-vault-tenant-id')
GPG_FILE = 'jenkins-release.gpg'
GPG_PASSPHRASE = credentials('release-gpg-passphrase-2023')
PACKAGING_GIT_REPOSITORY = 'git@github.com:jenkinsci/packaging.git'
// 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
PACKAGING_GIT_REPOSITORY = 'https://github.com/jenkinsci/packaging.git'
PACKAGING_GIT_BRANCH = 'master'
SIGN_KEYSTORE_FILENAME = 'jenkins.pfx'
SIGN_STOREPASS = credentials('signing-cert-pass-2023')
Expand Down Expand Up @@ -149,7 +150,7 @@ pipeline {
steps {
checkout scm
dir (WORKING_DIRECTORY) {
git branch: PACKAGING_GIT_BRANCH, credentialsId: 'release-key', url: PACKAGING_GIT_REPOSITORY
git branch: PACKAGING_GIT_BRANCH, url: PACKAGING_GIT_REPOSITORY
}

sh '''
Expand Down Expand Up @@ -277,7 +278,7 @@ pipeline {
container('dotnet') {
checkout scm
dir (WORKING_DIRECTORY) {
git branch: PACKAGING_GIT_BRANCH, credentialsId: 'release-key', url: PACKAGING_GIT_REPOSITORY
git branch: PACKAGING_GIT_BRANCH, url: PACKAGING_GIT_REPOSITORY

unstash 'GPG'
unstash 'WAR'
Expand Down
23 changes: 17 additions & 6 deletions Jenkinsfile.d/infra-agents-health
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ pipeline {
AZURE_VAULT_CLIENT_ID = credentials('azure-vault-client-id')
AZURE_VAULT_CLIENT_SECRET = credentials('azure-vault-client-secret')
AZURE_VAULT_TENANT_ID = credentials('azure-vault-tenant-id')
// 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
PACKAGING_GIT_REPOSITORY = 'https://github.com/jenkinsci/packaging.git'
PACKAGING_GIT_BRANCH = 'master'
WORKING_DIRECTORY = "release"
}

stages {
Expand All @@ -31,10 +35,13 @@ pipeline {
SSH_HOSTKEY_PKG_ORIGIN_JENKINS_IO = credentials('ssh-hostkey-pkg.origin.jenkins.io')
}
steps {
checkout scm

// Ensure we can get the secondary git repository used for packaging
dir ('./release'){
git branch: 'master', credentialsId: 'release-key', url: 'git@github.com:jenkinsci/packaging.git'
dir (WORKING_DIRECTORY) {
git branch: PACKAGING_GIT_BRANCH, url: PACKAGING_GIT_REPOSITORY
}

// Ensure we can retrieve the Code Signing Certificate'
sh '''
utils/release.bash --downloadAzureKeyvaultSecret
Expand Down Expand Up @@ -91,14 +98,18 @@ pipeline {
}
}
steps {
// Ensure we can get the secondary git repository used for packaging
dir ('./release'){
git branch: 'master', credentialsId: 'release-key', url: 'git@github.com:jenkinsci/packaging.git'
}
pwsh 'java -version'
container('dotnet') {
powershell 'msbuild -version'
}

container('dotnet') {
checkout scm
// Ensure we can get the secondary git repository used for packaging
dir (WORKING_DIRECTORY) {
git branch: PACKAGING_GIT_BRANCH, url: PACKAGING_GIT_REPOSITORY
}
}
}
}
}
Expand Down