Branch: refs/heads/master Home: https://github.com/jenkinsci/parameterized-trigger-plugin Commit: 4df5f87e9e8c2d65f914621f23c686b3ce5de5ae https://github.com/jenkinsci/parameterized-trigger-plugin/commit/4df5f87e9e8c2d65f914621f23c686b3ce5de5ae Author: Antoine Musso <has...@free.fr> Date: 2023-11-22 (Wed, 22 Nov 2023)
Changed paths: M src/main/java/hudson/plugins/parameterizedtrigger/TriggerBuilder.java M src/test/java/hudson/plugins/parameterizedtrigger/test/TriggerBuilderTest.java Log Message: ----------- Cancel triggered build on InterruptException When a triggering project is cancelled by interrupting its Executor thread and a triggered project is waiting in the build queue (via `waitForStart()`) the InterruptedException is not handled. The tiggered project is properly cancelled, but the triggering project is left in the queue and will eventually run when a slot is available. Catch InterruptException while waiting for the triggered project to start and cancel the queued run. Stacktrace with parameterized-trigger-2.44: org.jenkinsci.plugins.postbuildscript.PostBuildScriptException: java.lang.InterruptedException at org.jenkinsci.plugins.postbuildscript.processor.Processor.processBuildSteps(Processor.java:190) at org.jenkinsci.plugins.postbuildscript.processor.Processor.processScripts(Processor.java:91) at org.jenkinsci.plugins.postbuildscript.processor.Processor.process(Processor.java:79) at org.jenkinsci.plugins.postbuildscript.processor.Processor.process(Processor.java:73) at org.jenkinsci.plugins.postbuildscript.PostBuildScript.perform(PostBuildScript.java:116) at hudson.tasks.BuildStepMonitor$1.perform(BuildStepMonitor.java:20) at hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:803) at hudson.model.AbstractBuild$AbstractBuildExecution.performAllBuildSteps(AbstractBuild.java:752) at hudson.model.Build$BuildExecution.post2(Build.java:177) at hudson.model.AbstractBuild$AbstractBuildExecution.post(AbstractBuild.java:697) at hudson.model.Run.execute(Run.java:1932) at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:43) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused by: java.lang.InterruptedException at java.base/java.lang.Object.wait(Native Method) at java.base/java.lang.Object.wait(Object.java:328) at hudson.remoting.AsyncFutureImpl.get(AsyncFutureImpl.java:79) at hudson.model.queue.FutureImpl.waitForStart(FutureImpl.java:68) at hudson.plugins.parameterizedtrigger.TriggerBuilder.perform(TriggerBuilder.java:146) at org.jenkinsci.plugins.postbuildscript.processor.Processor.processBuildSteps(Processor.java:180) ... 13 more https://phabricator.wikimedia.org/T282893 Commit: 36afdb38aa948ed6d2e091e594c14a76424d3ccd https://github.com/jenkinsci/parameterized-trigger-plugin/commit/36afdb38aa948ed6d2e091e594c14a76424d3ccd Author: Mark Waite <mark.earl.wa...@gmail.com> Date: 2023-11-22 (Wed, 22 Nov 2023) Changed paths: M pom.xml M src/main/java/hudson/plugins/parameterizedtrigger/ParameterizedTriggerUtils.java Log Message: ----------- Merge branch 'master' into T282893 Commit: b7c8232d73f9b52ac5ce56ecc743763c72c217f9 https://github.com/jenkinsci/parameterized-trigger-plugin/commit/b7c8232d73f9b52ac5ce56ecc743763c72c217f9 Author: Bruno Verachten <gount...@gmail.com> Date: 2023-11-22 (Wed, 22 Nov 2023) Changed paths: M src/main/java/hudson/plugins/parameterizedtrigger/TriggerBuilder.java M src/test/java/hudson/plugins/parameterizedtrigger/test/TriggerBuilderTest.java Log Message: ----------- Merge pull request #363 from hashar/T282893 Cancel pending triggered build when parent project is cancelled Compare: https://github.com/jenkinsci/parameterized-trigger-plugin/compare/b735ef831c7c...b7c8232d73f9 -- You received this message because you are subscribed to the Google Groups "Jenkins Commits" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-commits+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-commits/jenkinsci/parameterized-trigger-plugin/push/refs/heads/master/b735ef-b7c823%40github.com.