Only return names in getStageOrBranchName if it's a stage or branch #253
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
thatsmydoing
commented
Mar 17, 2024
| .orElse(getStageName(node)); | ||
| if (node instanceof BlockStartNode) { | ||
| // a stage or parallel branch must be a BlockStartNode | ||
| return getParallelName(node).or(() -> getStageName(node)); |
There was a problem hiding this comment.
This should be the same as the original code, I've just rewritten it to be more idiomatic.
If `stageOrBranchName` is present, we skip processing errors. This is on the assumption that if `stageOrBranchName` is present it is a stage or branch. However, normal steps like `sh` can have labels too and was returned as the `stageOrBranchName`. This causes labeled steps to not have their errors processed. We fix this by returning empty in `getStageOrBranchName` if the node is not a `BlockStartNode`.
thatsmydoing
force-pushed
the
labeled-step-error
branch
from
b708882
to
ea03e88
Compare
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.
If
stageOrBranchNameis present, we skip processing errors. This is on the assumption that ifstageOrBranchNameis present it is a stage or branch. However, normal steps likeshcan have labels too and was returned as thestageOrBranchName. This causes labeled steps to not have their errors processed.We fix this by returning empty in
getStageOrBranchNameif the node is not aBlockStartNode.This fixes #252
Testing done
I've tested this on a private Jenkins instance. As far as I can tell, it works as expected. This has no pre-existing tests and I'm honestly not sure how to write them.
Submitter checklist