Removing AbstractFolder.delete override
#356
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
jglick
commented
Oct 25, 2023
Comment on lines
+252
to
+254
| r.assertBuildStatus(Result.ABORTED, r.waitForCompletion(build1)); | ||
| r.assertBuildStatus(Result.ABORTED, r.waitForCompletion(build2)); | ||
| assertTrue(build3.isCancelled()); |
There was a problem hiding this comment.
Actually this passes even with src/main/ from this PR and pom.xml from master, i.e. using the original inherited AbstractItem.delete implementation which already cancelled builds and queue items for folder children. It would not call FreeStyleProject.delete prior to Folder.delete but there was not much practical impact (perhaps only missing calls to ItemListener.fireOnDeleted) since all of $JENKINS_HOME/jobs/d/ was deleted.
| FreeStyleBuild build1 = p.scheduleBuild2(0).getStartCondition().get(); | ||
| FreeStyleBuild build2 = p.scheduleBuild2(0).getStartCondition().get(); | ||
| QueueTaskFuture<FreeStyleBuild> build3 = p.scheduleBuild2(0); | ||
| Thread.sleep(1000); // TODO Queue.cancel(Item) can return false immediately after scheduling |
There was a problem hiding this comment.
jglick
commented
Oct 25, 2023
Vlatombe
approved these changes
Nov 14, 2023
…r-plugin into AbstractFolder.delete
basil
approved these changes
Dec 1, 2023
jglick
commented
Dec 1, 2023
| @@ -22,7 +22,7 @@ | |||
| <changelist>999999-SNAPSHOT</changelist> | |||
| <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo> | |||
| <!-- remember to change the io.jenkins.tools.bom artifact when changing this --> | |||
| <jenkins.version>2.387.3</jenkins.version> | |||
| <jenkins.version>2.433</jenkins.version> | |||
There was a problem hiding this comment.
Not yet in an LTS version of course. I have no strong opinion as to whether we should wait for that or not.
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.
Downstream of jenkinsci/jenkins#8645. Subsumes #355.