Fix hostname resolution in recent Jenkins versions #326
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The main worker got renamed from "master" to "built-in".
| @@ -70,7 +70,7 @@ protected Set<String> getNodeLabels(Run<?,?> run, final String nodeName) { | |||
|
|
|||
| // If there is no labels and the node name is master, | |||
| // we force the label "master". | |||
| if("master".equalsIgnoreCase(nodeName)){ | |||
| if("master".equalsIgnoreCase(nodeName) || "built-in".equalsIgnoreCase(nodeName)) { | |||
There was a problem hiding this comment.
Could it be worth it to have this method in a utility method. It seems we're repeating the same checks multiple times
drodriguezhdez
approved these changes
Feb 10, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
The main worker got renamed from "master" to "built-in" in recent Jenkins versions. Adds support for both names.
Review checklist (to be filled by reviewers)
changelog/label attached. If applicable it should have thebackward-incompatiblelabel attached.do-not-merge/label attached.kind/andseverity/labels attached at least.