[JENKINS-70726] Build result scoring skipped on pipeline jobs #65
+69
−12
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
|
oh, i also had a second freebie commit for just some random code-cleanup/typos. |
vtwaldo21
changed the title
viceice
reviewed
Jul 22, 2024
...m/jenkins/plugins/scoringloadbalancer/rules/BuildResultScoringRule/help-scoreForFailure.html
Outdated
Show resolved
Hide resolved
src/test/java/jp/ikedam/jenkins/plugins/scoringloadbalancer/ScoringLoadBalancerTest.java
Outdated
Show resolved
Hide resolved
viceice
changed the title
viceice
changed the title
viceice
changed the title
viceice
changed the title
vtwaldo21
force-pushed
the
bugfix/64-buildresult-scoring-skipped-on-pipeline-jobs
branch
from
3844c32 to
89e9d4f
Compare
BuildResult scoring always returned 0 for pipeline jobs, this change hopefully supports both freestyle and pipeline jobs by properly checking the class type
vtwaldo21
force-pushed
the
bugfix/64-buildresult-scoring-skipped-on-pipeline-jobs
branch
from
89e9d4f to
0d1518c
Compare
viceice
reviewed
Aug 22, 2024
| WorkflowRun pipelinebuild = null; | ||
|
|
||
| if ((subtask instanceof AbstractProject)) { | ||
| AbstractProject<?, ?> project = (AbstractProject<?, ?>) subtask; |
There was a problem hiding this comment.
Suggested change
| AbstractProject<?, ?> project = (AbstractProject<?, ?>) subtask; | |
| var project = (AbstractProject<?, ?>) subtask; |
Use var where possible
| AbstractProject<?, ?> project = (AbstractProject<?, ?>) subtask; | ||
| freestylebuild = project.getLastBuild(); | ||
| } else if (subtask != null) { | ||
| Executable qexec = subtask.getOwnerExecutable(); |
There was a problem hiding this comment.
Suggested change
| Executable qexec = subtask.getOwnerExecutable(); | |
| var qexec = subtask.getOwnerExecutable(); |
| } else if (subtask != null) { | ||
| Executable qexec = subtask.getOwnerExecutable(); | ||
| if (qexec != null && (qexec.getParent() instanceof WorkflowJob)) { | ||
| WorkflowJob wfj = (WorkflowJob) qexec.getParent(); |
There was a problem hiding this comment.
Suggested change
| WorkflowJob wfj = (WorkflowJob) qexec.getParent(); | |
| var wfj = (WorkflowJob) qexec.getParent(); |
| result = freestylebuild.getResult(); | ||
| freestylebuild = freestylebuild.getPreviousBuild(); | ||
| } else if (pipelinebuild != null) { | ||
| FlowExecution fexec = pipelinebuild.getExecution(); |
There was a problem hiding this comment.
Suggested change
| FlowExecution fexec = pipelinebuild.getExecution(); | |
| var fexec = pipelinebuild.getExecution(); |
| continue; | ||
| } | ||
|
|
||
| FlowGraphWalker fgw = new FlowGraphWalker(fexec); |
There was a problem hiding this comment.
Suggested change
| FlowGraphWalker fgw = new FlowGraphWalker(fexec); | |
| var fgw = new FlowGraphWalker(fexec); |
| FlowGraphWalker fgw = new FlowGraphWalker(fexec); | ||
| for (FlowNode fn : fgw) { | ||
| if (fn instanceof StepStartNode) { | ||
| WorkspaceAction action = (WorkspaceAction) fn.getAction(WorkspaceAction.class); |
There was a problem hiding this comment.
Suggested change
| WorkspaceAction action = (WorkspaceAction) fn.getAction(WorkspaceAction.class); | |
| var action = (WorkspaceAction) fn.getAction(WorkspaceAction.class); |
| nodesScore.addScore(node, getScoreForFailure() * scale); | ||
| nodeSet.remove(node); | ||
| } else if (Result.UNSTABLE == build.getResult()) { | ||
| } else if (Result.UNSTABLE == result) { |
There was a problem hiding this comment.
Can you add a test case to cover code?
|
|
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.
Added support for Build Result scoring on pipeline jobs (was always returning 0)
closes #64
https://issues.jenkins.io/browse/JENKINS-70726
Testing done
Verified that jobs were scored based on Build Result when the job was pipeline using the logging feature. Did not regression test that freestyle jobs continue to work.
Submitter checklist