-
-
Notifications
You must be signed in to change notification settings - Fork 8.8k
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.
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
Label parsing robustness fix #8448
Merged
Merged
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
… its super implementation recover from it, and issue a warning to raise a bug against the impacted plugin.
Vlatombe
added
major-bug
For changelog: Major bug. Will be highlighted on the top of the changelog
and removed
bug
For changelog: Minor bug. Will be listed after features
labels
Aug 31, 2023
daniel-beck
reviewed
Aug 31, 2023
daniel-beck
reviewed
Aug 31, 2023
Co-authored-by: Daniel Beck <[email protected]>
daniel-beck
added
the
regression-fix
Pull request that fixes a regression in one of the previous Jenkins releases
label
Aug 31, 2023
daniel-beck
approved these changes
Aug 31, 2023
NotMyFault
approved these changes
Aug 31, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Optional feedback for consideration:
diff --git a/test/src/test/java/jenkins/model/NodesRestartTest.java b/test/src/test/java/jenkins/model/NodesRestartTest.java
index 837bed98d7..707fd4c649 100644
--- a/test/src/test/java/jenkins/model/NodesRestartTest.java
+++ b/test/src/test/java/jenkins/model/NodesRestartTest.java
@@ -18,8 +18,8 @@ public class NodesRestartTest {
public RestartableJenkinsRule s = new RestartableJenkinsRule();
// The point of this implementation is to override readResolve so that Slave#readResolve doesn't get called.
- public static class DummyDumbSlave extends Slave {
- public DummyDumbSlave(@NonNull String name, String remoteFS, ComputerLauncher launcher) throws Descriptor.FormException, IOException {
+ public static class DummyAgent extends Slave {
+ public DummyAgent(@NonNull String name, String remoteFS, ComputerLauncher launcher) throws Descriptor.FormException, IOException {
super(name, remoteFS, launcher);
}
@@ -33,7 +33,7 @@ public class NodesRestartTest {
public void checkNodeRestart() throws Exception {
s.then(r -> {
assertThat(r.jenkins.getNodes(), hasSize(0));
- var node = new DummyDumbSlave("my-node", "temp", r.createComputerLauncher(null));
+ var node = new DummyAgent("my-node", "temp", r.createComputerLauncher(null));
r.jenkins.addNode(node);
assertThat(r.jenkins.getNodes(), hasSize(1));
});
basil
reviewed
Aug 31, 2023
This PR is now ready for merge. We will merge it after approximately 24 hours if there is no negative feedback. |
Vlatombe
added
the
ready-for-merge
The PR is ready to go, and it will be merged soon if there is no negative feedback
label
Sep 1, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
major-bug
For changelog: Major bug. Will be highlighted on the top of the changelog
ready-for-merge
The PR is ready to go, and it will be merged soon if there is no negative feedback
regression-fix
Pull request that fixes a regression in one of the previous Jenkins releases
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.
Amends #8395
In case an extension of
Slave
overridesreadResolve
but does not call its super implementation, thisrecover from it, and issue a warning to raise a bug against the impacted plugin.
See JENKINS-XXXXX.
Testing done
Proposed changelog entries
readResolve
implementations from breaking agent label parsing.Proposed upgrade guidelines
N/A
Submitter checklist
Desired reviewers
@mention
Before the changes are marked as
ready-for-merge
:Maintainer checklist