Commit 3805482
authored
fix: Make BecauseResourcesTimeout fatal to fix freestyle lock timeout on Jenkins 2.532+ (#1027)
Jenkins 2.532 (core PR #11173) changed Queue.maintain() to create a new
BlockedItem instead of updating the existing one when canRun() returns a
CauseOfBlockage. This caused the manual Queue.cancel() in
checkFreestyleTimeout() to be immediately undone.
Override isFatal() returning true on BecauseResourcesTimeout so the queue
itself handles the cancellation. Also bump Jenkins baseline to 2.541 (the
next LTS line that includes the isFatal() API) and update BOM accordingly.
Fixes #10261 parent d273202 commit 3805482
2 files changed
Lines changed: 12 additions & 2 deletions
File tree
- src/main/java/org/jenkins/plugins/lockableresources/queue
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
55 | 55 | | |
56 | 56 | | |
57 | 57 | | |
58 | | - | |
| 58 | + | |
59 | 59 | | |
60 | 60 | | |
61 | 61 | | |
| |||
71 | 71 | | |
72 | 72 | | |
73 | 73 | | |
74 | | - | |
| 74 | + | |
75 | 75 | | |
76 | 76 | | |
77 | 77 | | |
| |||
Lines changed: 10 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
265 | 265 | | |
266 | 266 | | |
267 | 267 | | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
268 | 278 | | |
269 | 279 | | |
0 commit comments