This repository was archived by the owner on Feb 10, 2026. It is now read-only.
Update Datical fork from jenkinsci fork#3
Open
SteveDonie wants to merge 1266 commits intoDatical:masterfrom
Open
Update Datical fork from jenkinsci fork#3SteveDonie wants to merge 1266 commits intoDatical:masterfrom
SteveDonie wants to merge 1266 commits intoDatical:masterfrom
Conversation
* NPE during the release of a lock * API-properties * Using many very fast parallel locks in the same job may raise ConcurrentModificationException * chaosOnRestart
Bumps [crowdin/github-action](https://github.com/crowdin/github-action) from 1.18.0 to 1.19.0. - [Release notes](https://github.com/crowdin/github-action/releases) - [Commits](crowdin/github-action@v1.18.0...v1.19.0) --- updated-dependencies: - dependency-name: crowdin/github-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Bas van Erp <bas.van.erp@politie.nl>
…82.vdce2153031a_0 (#652) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [crowdin/github-action](https://github.com/crowdin/github-action) from 1.20.2 to 1.20.3. - [Release notes](https://github.com/crowdin/github-action/releases) - [Commits](crowdin/github-action@v1.20.2...v1.20.3) --- updated-dependencies: - dependency-name: crowdin/github-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
…din/github-action-1.20.3 Bump crowdin/github-action from 1.20.2 to 1.20.3
--- updated-dependencies: - dependency-name: crowdin/github-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
…din/github-action-1.20.4 Bump crowdin/github-action from 1.20.3 to 1.20.4
https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ recommends Jenkins 2.440.3 rather than 2.440.1. Let's upgrade the requirement to 2.440.3 so that the dependabot pull request for BOM can be merged. #660 is the dependabot pull request
Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v5...v6) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
…ons/checkout-6 Bump actions/checkout from 5 to 6
* Bump org.jenkins-ci.plugins:plugin from 5.27 to 5.28 Bumps [org.jenkins-ci.plugins:plugin](https://github.com/jenkinsci/plugin-pom) from 5.27 to 5.28. - [Release notes](https://github.com/jenkinsci/plugin-pom/releases) - [Changelog](https://github.com/jenkinsci/plugin-pom/blob/master/CHANGELOG.md) - [Commits](jenkinsci/plugin-pom@plugin-5.27...plugin-5.28) --- updated-dependencies: - dependency-name: org.jenkins-ci.plugins:plugin dependency-version: '5.28' dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Update formatting with spotless --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mark Waite <mark.earl.waite@gmail.com>
… copy constructor [JENKINS-76294] Signed-off-by: Jim Klimov <jimklimov+jenkinsci@gmail.com>
…update comments [JENKINS-76294] Signed-off-by: Jim Klimov <jimklimov+jenkinsci@gmail.com>
Bumps [crowdin/github-action](https://github.com/crowdin/github-action) from 2.12.0 to 2.13.0. - [Release notes](https://github.com/crowdin/github-action/releases) - [Commits](crowdin/github-action@v2.12.0...v2.13.0) --- updated-dependencies: - dependency-name: crowdin/github-action dependency-version: 2.13.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…953) Bumps [org.jenkins-ci.plugins:plugin](https://github.com/jenkinsci/plugin-pom) from 5.28 to 5.2099.v68c2f5e27299. - [Release notes](https://github.com/jenkinsci/plugin-pom/releases) - [Changelog](https://github.com/jenkinsci/plugin-pom/blob/master/CHANGELOG.md) - [Commits](jenkinsci/plugin-pom@plugin-5.28...5.2099.v68c2f5e27299) --- updated-dependencies: - dependency-name: org.jenkins-ci.plugins:plugin dependency-version: 5.2099.v68c2f5e27299 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [org.jenkins-ci.plugins:plugin](https://github.com/jenkinsci/plugin-pom) from 5.2099.v68c2f5e27299 to 5.2102.v5f5fe09fccf1. - [Release notes](https://github.com/jenkinsci/plugin-pom/releases) - [Changelog](https://github.com/jenkinsci/plugin-pom/blob/master/CHANGELOG.md) - [Commits](jenkinsci/plugin-pom@5.2099.v68c2f5e27299...5.2102.v5f5fe09fccf1) --- updated-dependencies: - dependency-name: org.jenkins-ci.plugins:plugin dependency-version: 5.2102.v5f5fe09fccf1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [crowdin/github-action](https://github.com/crowdin/github-action) from 2.13.0 to 2.14.0. - [Release notes](https://github.com/crowdin/github-action/releases) - [Commits](crowdin/github-action@v2.13.0...v2.14.0) --- updated-dependencies: - dependency-name: crowdin/github-action dependency-version: 2.14.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [crowdin/github-action](https://github.com/crowdin/github-action) from 2.14.0 to 2.15.0. - [Release notes](https://github.com/crowdin/github-action/releases) - [Commits](crowdin/github-action@v2.14.0...v2.15.0) --- updated-dependencies: - dependency-name: crowdin/github-action dependency-version: 2.15.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Investigate and address `ConcurrentModificationException` which occasionally happens during XStream saving of running workflows [JENKINS-76294]
Bumps [crowdin/github-action](https://github.com/crowdin/github-action) from 2.15.0 to 2.15.2. - [Release notes](https://github.com/crowdin/github-action/releases) - [Commits](crowdin/github-action@v2.15.0...v2.15.2) --- updated-dependencies: - dependency-name: crowdin/github-action dependency-version: 2.15.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* ci: Add auto-approve workflow for owner PRs without review Adds a daily scheduled workflow (08:00 UTC, also manual trigger) that auto-approves open PRs from repo OWNER/MEMBER after 3 days without review. Countdown labels give reviewers clear visibility: Day 0 -> merge-in-3-days-without-review Day 1 -> merge-in-2-days-without-review Day 2 -> merge-in-1-day-without-review Day 3 -> approved + merged-without-review (auto-merge takes over) PRs that already have an approving review are skipped. * feat: Add comments for auto-approval countdown on owner PRs * refactor: Simplify auto-approve workflow by removing countdown label creation steps
* Add clarification on support for the plugin * Restrict author associations to 'OWNER' only
Bumps [io.jenkins.tools.bom:bom-2.528.x](https://github.com/jenkinsci/bom) from 6166.va_a_8b_5eda_8ef5 to 6210.v69ea_fd8a_f010. - [Release notes](https://github.com/jenkinsci/bom/releases) - [Commits](https://github.com/jenkinsci/bom/commits) --- updated-dependencies: - dependency-name: io.jenkins.tools.bom:bom-2.528.x dependency-version: 6210.v69ea_fd8a_f010 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…ipt caching (#966) * Ludicrous Mode: Lockable resources queue contention reduction and script caching What is ludicrous speed? ------------------------ [Obligatory video of ludicrous speed](https://youtu.be/oApAdwuqtn8?si=uJHPP5OXz9GNllY0) <details><summary>Ludicrous speed is faster than light speed</summary> ---  </details> --- Background ---------- I am patching all plugins which affect Jenkins queue maintenance performance as part of an overall initiative to make Jenkins faster for everyone. Your plugin has been identified for adversely affecting queue performance and so I am opening a proposal pull request to fix the performance issue. Please keep the `Ludocrous Mode:` prefix in the pull request title so that patches can be tracked across all plugins. Patch details ------------- `Queue.maintian()` is a critical path in Jenkins core. Any performance delays can significantly impact Jenkins scheduling work on agents. Benchmarking for `Queue.maintain()` should execute in only a few milliseconds even when Jenkins agents reach in the thousands. This patch provides three key features: * Lightweight API calls called by `Queue.maintain()` should instantly return. * Heavyweight API calls are made in the background (e.g. resource evaluation) outside of the `Queue.maintain()` path. * Since `Queue.maintain()` has extreme performance, `scheduleMaintenance()` can be more aggressively called as locked resources become available. --- The lockable-resources-plugin hooks into the Queue via a `QueueTaskDispatcher` — its `canRun(Queue.Item)` method is called **under the Queue lock** for every item on every `Queue.maintain()` cycle. Unlike cloud plugins that use `RetentionStrategy` or `Cloud`, a `QueueTaskDispatcher` sits in the absolute innermost loop of Queue maintenance. Three issues were found: 1. **No `scheduleMaintenance()` triggers anywhere.** When resources are freed (build completes, pipeline lock body finishes, user unreserves via UI), items waiting in the Jenkins Queue for those resources wait up to 5 seconds for the next timer tick. The patch adds immediate `scheduleMaintenance()` calls at 6 resource-freeing events: `unlockResources()`, `unreserve()`, `reset()`, `LockRunListener.onCompleted()`, `LockRunListener.onDeleted()`, and `FreeDeadJobs.freePostMortemResources()`. 2. **`syncResources` lock contention under Queue lock.** The plugin uses a `synchronized(syncResources)` monitor in `tryQueue()` that is also held by threads doing disk I/O (`save()`). When `onCompleted()` holds `syncResources` during a config write, `canRun()` under the Queue lock blocks waiting — transitively extending Queue lock hold time by disk write latency. The patch makes `save()` asynchronous with coalescing and narrows the `syncResources` scope in `tryQueue()` so that candidate resolution (label matching, Groovy script evaluation) runs outside the critical section. 3. **Groovy script and label expression evaluation under Queue lock.** When jobs use `resourceMatchScript`, `canRun()` evaluates a Groovy script for every lockable resource on every cache miss. The existing `cachedCandidates` Guava cache mitigates repeated evaluations, but cache misses (first call, or after resource state change) are heavyweight. Similarly, `isValidLabel()` parses label expressions and allocates `LabelAtom` sets on every call. The patch adds per-resource TTL caches for both script evaluation results and label expression results. Original Patch series --------------------- Some background. This patch is part of a series (ludicrous patch series) which enables my production instance to scale work up to ludicrous amounts of agents. - [ec2 plugin] - [job-restrictions plugin] - [leastload plugin] AI Analysis ----------- See detailed [AI analysis for lockable-resources plugin][1]. You're welcome to copy any documentation from the AI analysis that you find you want included. I purposefully separated the analysis in order to limit how much I am changing in your repository. Testing done ------------ I do rely on this plugin in production. I have not tested this patch, yet. I plan to deploy it to my production instance after non-prod testing completes. I will follow up in this pull request when I'm successfully running this in production. Advisory -------- I plan to update Jenkins core with warnings when there's plugins which adversely affect Jenkins queue performance. Please keep in mind not merging changes with this strategy will involve this plugin being called out for tanking Jenkins performance. This patch solves a critical performance issue for your plugin so that it does not tank Jenkins performance (in how fast Jenkins schedules work on agents). Submitter checklist ------------------- - [x] Make sure you are opening from a **topic/feature/bugfix branch** (right side) and not your main branch! - [x] Ensure that the pull request title represents the desired changelog entry - [x] Please describe what you did - [ ] Link to relevant issues in GitHub or Jira - [x] Link to relevant pull requests, esp. upstream and downstream changes - [ ] Ensure you have provided tests that demonstrate the feature works or the issue is fixed [1]: https://github.com/samrocketman/jenkins-ai-analysis/tree/main/ludicrous-mode-analysis/lockable-resources-plugin [ec2 plugin]: jenkinsci/ec2-plugin#2000 [job-restrictions plugin]: jenkinsci/job-restrictions-plugin#210 [leastload plugin]: jenkinsci/leastload-plugin#22 Co-authored-by: sgleske@integralads.com * Fix async save state loss on restart with a @Terminator flush hook Default asyncSaveEnabled to true and add a @Terminator shutdown hook that flushes any pending coalesced save synchronously before Jenkins exits. Also add a null guard in uncacheIfFreeing for defensive safety. * spotless apply --------- Co-authored-by: Martin Pokorny <89339813+mPokornyETM@users.noreply.github.com>
… PRs (#979) * docs: Update Copilot instructions and enhance auto-labeling workflows * ci: Update countdown label logic for trusted authors in auto-label workflow * ci: Update auto-approve countdown logic to include COLLABORATOR PRs
Bumps [crowdin/github-action](https://github.com/crowdin/github-action) from 2.15.2 to 2.16.0. - [Release notes](https://github.com/crowdin/github-action/releases) - [Commits](crowdin/github-action@v2.15.2...v2.16.0) --- updated-dependencies: - dependency-name: crowdin/github-action dependency-version: 2.16.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Martin Pokorny <89339813+mPokornyETM@users.noreply.github.com>
Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 6. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v4...v6) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Martin Pokorny <89339813+mPokornyETM@users.noreply.github.com>
Add workflow to automatically keep open PRs up-to-date: - Dependabot PRs: uses @dependabot rebase command - Other non-draft PRs: uses gh pr update-branch --rebase - Simplify dependabot-auto-merge.yml by removing redundant update step
- Reduce resource count from 50 to 5 to reduce non-determinism - Wait for b2's semaphores to start before releasing them - Use waitForCompletion() and assertBuildStatusSuccess() for proper build completion verification instead of waitForMessage() The test was flaky due to timing issues with 50 parallel resources and nested locks across 3 builds resuming after Jenkins restart.
* Add updateLock pipeline step for resource management This step allows pipelines to dynamically manage lockable resources: - Create new resources (createResource: true) - Delete existing resources (deleteResource: true) - Modify labels (setLabels, addLabels, removeLabels) - Set notes (setNote) Based on the original design from PR #305 by @gaspardpetit. Fixes #305 * Remove @SInCE TODO - not applicable for plugins * Add updateLock step documentation to README * fix: Add CSRF protection and permission checks to doCheck* methods Addresses security warnings from github-advanced-security[bot]: - Add @RequirePOST annotation to doCheckResource, doCheckAddLabels, doCheckRemoveLabels, and doCheckDeleteResource - Add @AncestorInPath Item parameter and permission checks to prevent unauthorized form validation calls
…#972) * feat: Support build parameters in resource names, labels, and numbers Allow references in the Required Lockable Resources job property so that resource names, labels, and resource numbers can be resolved from build parameters at queue time and build start. Changes: - Utils: add requiredResources(Job, EnvVars) overload and getParametersAsEnvVars(Queue.Item) to extract build parameters - LockableResourcesStruct: expand requiredNumber via env.expand() - LockableResourcesQueueTaskDispatcher: pass build parameters from queue item to resource struct for early expansion - LockRunListener: pass AbstractBuild environment to resource struct so parameter references are expanded at build start - RequiredResourcesProperty: form validation now recognises \ patterns and shows a warning instead of an error - Messages.properties: add warning messages for parameter references - Tests: add parameterizedResourceName, parameterizedLabel, parameterizedResourceNumber tests and UtilsTest.containsVariable Fixes #159, Fixes #202 Replaces #214 * style: Apply spotless formatting * fix: Narrow exception handling to satisfy SpotBugs REC_CATCH_EXCEPTION - Utils.getParametersAsEnvVars: remove unnecessary try-catch (APIs do not throw checked exceptions) - LockRunListener.onStarted: catch IOException | InterruptedException instead of generic Exception * test: Add comprehensive unit tests for getParametersAsEnvVars() Add 7 new test methods covering all code paths: - No actions (empty list) - Single parameter - Multiple parameters in one action - Multiple ParametersAction instances - Null parameter value (skipped) - Non-string value (converted via toString) - Duplicate key across actions (later wins) Also fix @NoExternalUse annotations to use @restricted(NoExternalUse.class) and add missing imports for ExcludeFromJacocoGeneratedReport.
…rce strategy - Add doFillResourceSelectStrategyItems with @RequirePOST and permission check - Validate resourceSelectStrategy in setter and throw exception for invalid values - Change config.jelly to use f:select instead of f:textbox Fixes security warning for missing permission check. Addresses review comment about silent failures for invalid strategy values.
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
20 participants
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.
No description provided.