Skip to content
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.

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

[JENKINS-49813] RunningJobs: Remove extra shouldCancelPatchsetNumber check #356

Merged
merged 1 commit into from Mar 28, 2018

Conversation

Projects
None yet
3 participants
@aswild
Copy link
Contributor

commented Mar 1, 2018

An extra check for !shouldCancelPatchsetNumber after the check for
(!abortBecauseOfTopic && !shouldCancelpatchsetNumber) breaks the "Abort
patch sets with same topic" feature.
It appears that these lines were added inadvertently during
merge conflict resolution in 7455d86.

Removing this extra if block allows for cancelling running jobs when
a new patchset arrives on the same topic.

Signed-off-by: Allen Wild allenwild93@gmail.com

[JENKINS-49813] RunningJobs: Remove extra shouldCancelPatchsetNumber …
…check

An extra check for !shouldCancelPatchsetNumber after the check for
(!abortBecauseOfTopic && !shouldCancelpatchsetNumber) breaks the "Abort
patch sets with same topic" feature.
It appears that these lines were added inadvertently during
merge conflict resolution in 7455d86.

Removing this extra if block allows for cancelling running jobs when
a new patchset arrives on the same topic.

Signed-off-by: Allen Wild <allenwild93@gmail.com>
@Jimilian

This comment has been minimized.

Copy link
Contributor

commented Mar 2, 2018

It was not my best commit :/ See #357 for more interesting things...

@rsandell does it make sense to keep this class as inner-private? maybe we can move RunningJobs to own file with tests, etc?

@rsandell

This comment has been minimized.

Copy link
Member

commented Mar 28, 2018

@Jimilian some refactoring in this area wouldn't hurt :)

@rsandell rsandell merged commit a3bf98d into jenkinsci:master Mar 28, 2018

1 check passed

continuous-integration/jenkins/pr-merge This commit looks good
Details

@aswild aswild deleted the aswild:jenkins-49813 branch Mar 28, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.