Skip to content

Branching registryCredentialsId based off region and nodeLabel - #3148

Merged
aleclorimer merged 1 commit into
mainfrom
jenkins-docker-auth-fix
Jul 28, 2026
Merged

Branching registryCredentialsId based off region and nodeLabel#3148
aleclorimer merged 1 commit into
mainfrom
jenkins-docker-auth-fix

Conversation

@aleclorimer

@aleclorimer aleclorimer commented Jul 27, 2026

Copy link
Copy Markdown
Contributor

This change looks to solve a jenkins workflow error in which the CN prod runner fails due to a credential error. The targeted logic of 'artifactory-credentials' when on the CN prod jenkins runner have been tested to work in a test environment. This change should have the affect of changing registryCredentialsId only and the registryURL for CN Prod.

Region Environment Credentials RegistryURL
Global Staging artifactory <empty/default>
Global Prod artifactory <empty/default>
China Staging artifactory <empty/default>
China Prod artifactory-credentials registry.artifactoryedge.streleng.cn

Comment thread Jenkinsfile Outdated
docker {
image 'python:3.10'
label "${params.NODE_LABEL ?: 'production'}"
registryUrl 'https://registry.artifactoryedge.streleng.cn'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why the .cn registry URL?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoops, this should probably be gated on CN and prod. Otherwise kept normal

@hcarter-775 hcarter-775 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this is fairly specific code that doesn't really have codified reasons to exist, I would suggest adding some commentary in the file itself (tbh, effectively what's in the PR description). The table you have helps clarify what we're expecting here, so I just don't want us to forget, or need to dig up the PR

@aleclorimer
aleclorimer force-pushed the jenkins-docker-auth-fix branch from b3906e4 to 9bcb729 Compare July 28, 2026 21:58
@aleclorimer
aleclorimer force-pushed the jenkins-docker-auth-fix branch from 9bcb729 to 4026115 Compare July 28, 2026 21:58
@aleclorimer
aleclorimer merged commit f5d8f70 into main Jul 28, 2026
1 check passed
@aleclorimer
aleclorimer deleted the jenkins-docker-auth-fix branch July 28, 2026 21:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants