Skip to content

Overide gitLabCommitStatusStep to use it for setting pending status #967

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

Overide gitLabCommitStatusStep to use it for setting pending status #967

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
844c575
Overide gitLabCommitStatusStep to use it for setting pending status
Sep 4, 2019
5e53a28
Adding state variable to FitLabCommitStatusStep class
Sep 4, 2019
0e0163a
Fixing DataBoundSetter
Sep 4, 2019
c4225fc
Fixing return type not set
Sep 4, 2019
74142bd
Fixing return type not set
Sep 4, 2019
d9e1fb2
If build hasn't been run the state shall remain pending
Sep 4, 2019
50e7cad
If step is null don't check
Sep 9, 2019
6f1cbb9
Merge branch 'jenkinsci:master' into master
xmass Dec 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 21 additions & 5 deletions src/main/java/com/dabsquared/gitlabjenkins/workflow/GitLabCommitStatusStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public class GitLabCommitStatusStep extends Step {
private String name;
private List<GitLabBranchBuild> builds = new ArrayList<GitLabBranchBuild>() ;
private GitLabConnectionProperty connection;
private String state;

@DataBoundConstructor
public GitLabCommitStatusStep(String name){
Expand All @@ -55,6 +56,15 @@ public List<GitLabBranchBuild> getBuilds() {
return builds;
}

@DataBoundSetter
public void setState(String state){
this.state = StringUtils.isEmpty(state) ? null : state;
}

public String getState() {
return state;
}

@DataBoundSetter
public void setBuilds(List<GitLabBranchBuild> builds) {
this.builds = builds;
Expand Down Expand Up @@ -91,16 +101,22 @@ public boolean start() throws Exception {
.withCallback(new BodyExecutionCallback() {
@Override
public void onStart(StepContext context) {
CommitStatusUpdater.updateCommitStatus(run, getTaskListener(context), BuildState.running, name, step.builds, step.connection);
PendingBuildsAction action = run.getAction(PendingBuildsAction.class);
if (action != null) {
action.startBuild(name);
if (step.state == null) {
CommitStatusUpdater.updateCommitStatus(run, getTaskListener(context), BuildState.running, name, step.builds, step.connection);
PendingBuildsAction action = run.getAction(PendingBuildsAction.class);
if (action != null) {
action.startBuild(name);
}
} else if (step.state == "pending") {
CommitStatusUpdater.updateCommitStatus(run, getTaskListener(context), BuildState.pending, name, step.builds, step.connection);
}
}

@Override
public void onSuccess(StepContext context, Object result) {
CommitStatusUpdater.updateCommitStatus(run, getTaskListener(context), BuildState.success, name, step.builds, step.connection);
if (step == null || step.state == null || step.state != "pending") {
CommitStatusUpdater.updateCommitStatus(run, getTaskListener(context), BuildState.success, name, step.builds, step.connection);
}
context.onSuccess(result);
}

Expand Down