Skip to content

hotfix(infra.getBuildAgentLabel): no spot/nonspot label when called from trusted.ci.jenkins.io#986

Merged
lemeurherve merged 2 commits intojenkins-infra:masterfrom
lemeurherve:fix-no-spot-labels-on-trusted
Jan 29, 2026
Merged

hotfix(infra.getBuildAgentLabel): no spot/nonspot label when called from trusted.ci.jenkins.io#986
lemeurherve merged 2 commits intojenkins-infra:masterfrom
lemeurherve:fix-no-spot-labels-on-trusted

Conversation

@lemeurherve
Copy link
Contributor

@lemeurherve lemeurherve commented Jan 29, 2026

This change prevents the addition of "spot" or "nonspot" when called from trusted.ci.jenkins.io as none of its (Azure) agent templates include any of these labels.

Noticed on https://trusted.ci.jenkins.io/job/Containers/job/Agents/job/docker-agents/job/3355.v388858a_47b_33-8/1/consoleFull

Amends:

Related:

Testing done

  • Updated requirements in tests with e0124ce, mvn test fails (as expected) ❌
[ERROR]   InfraStepTests.testGetBuildAgentLabel:579 Unexpected result for case: [platform:windows-2019, container:false, trustedEnv:true, expected:windows-2019, warning:null] expected:<windows-2019[]> but was:<windows-2019[ && spot]>
[ERROR]   InfraStepTests.testGetBuildAgentLabel:579 Unexpected result for case: [platform:windows-2025, container:false, trustedEnv:true, retry:2, expected:windows-2025, warning:null] expected:<windows-2025[]> but was:<windows-2025[ && nonspot]>
  • After the fix from d623b4a, mvn test passes ✅

Footnotes

  1. I should have tested a dry-run on trusted.ci.jenkins.io first, my mistake, sorry.

@lemeurherve lemeurherve requested a review from a team as a code owner January 29, 2026 10:07
@lemeurherve lemeurherve requested a review from a team January 29, 2026 10:08
@lemeurherve lemeurherve changed the title hotfix(infra.getBuildAgentLabel): no spot/nonspot label in trusted.ci.jenkins.io hotfix(infra.getBuildAgentLabel): no spot/nonspot label when called from trusted.ci.jenkins.io Jan 29, 2026
@lemeurherve lemeurherve merged commit e5ad998 into jenkins-infra:master Jan 29, 2026
3 checks passed
@lemeurherve lemeurherve deleted the fix-no-spot-labels-on-trusted branch January 29, 2026 10:20
@lemeurherve
Copy link
Contributor Author

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants