Make jenkins_generic_job glob more strict by adding mach_comp - #5035
Open
jgfouca wants to merge 2 commits into
Open
Make jenkins_generic_job glob more strict by adding mach_comp#5035jgfouca wants to merge 2 commits into
jgfouca wants to merge 2 commits into
Conversation
Also, transition jenkins and wait_for_tests to modern py string formatting
jgfouca
requested review from
jasonb5 and
rljacob
and
a balanced review from Copilot
August 20, 2026 19:40
jgfouca
commented
Aug 20, 2026
|
|
||
| os.environ["CIME_MACHINE"] = machine.get_machine_name() | ||
|
|
||
| mach_comp = f"{machine.get_machine_name()}_{compiler}" |
Contributor
Author
There was a problem hiding this comment.
These are the only changes that weren't just string format updating.
Contributor
There was a problem hiding this comment.
Pull request overview
Strengthens Jenkins test discovery to avoid cross-job timestamp collisions and modernizes string formatting.
Changes:
- Restricts
TestStatusglobbing by machine and compiler. - Converts legacy formatting to f-strings.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
CIME/jenkins_generic_job.py |
Tightens test discovery and modernizes formatting. |
CIME/wait_for_tests.py |
Modernizes string formatting. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
| os.environ["CIME_MACHINE"] = machine.get_machine_name() | ||
|
|
||
| mach_comp = f"{machine.get_machine_name()}_{compiler}" | ||
| globstr = f"{test_root}/*{mach_comp}*{test_id}/TestStatus" |
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 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.
Also, transition jenkins and wait_for_tests to modern py string formatting.
We hit a very unlikely edge case where two PM jobs kicked off near the same time and ended up picking the same timestamp, which messed a lot of things up. Making the glob have the mach_comp in addition to the timestamp will prevent this from happening again.
Checklist