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

Should fix [JENKINS-70162] [JENKINS-72193] [JENKINS-70539] [JENKINS-69338] Fix topic cancelling patches (this close races in abortBuild) #504

Merged
merged 2 commits into from Mar 8, 2024

Conversation

panicking
Copy link
Contributor

Pull request fix bug connected of abort jobs coming from the same topic. What we try to get is the same behavior
of 2.36.1.

If we have a topic A->B->C we would like that the whole topic get built so build it from C. The problem was
that the jenkins try to build A , B and C for each new patcheset. There were mainly to problem:

  • one was the name matching
  • other was block syncronization. I did not find for now a better way

Testing done

Create a project in gerrit, allow the project to be triggered and confirm that topic was really aborted

@panicking panicking force-pushed the fix-topic-cancelling-patches branch 4 times, most recently from 6b957be to 1177cf6 Compare February 19, 2024 15:31
@panicking
Copy link
Contributor Author

@rsandell For me is building but now it fails on CI, did not find any reason

@panicking panicking force-pushed the fix-topic-cancelling-patches branch 2 times, most recently from 50d78c2 to 7fb4ee8 Compare February 20, 2024 08:43
The matching was working on a flat project organization.

Jira-Id: JENKINS-70162
Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>
If lot of patches are sent the removing on the queue is not working and
job that must be aborted are not aborted. Suppose to have activated
abortTopic and we want to push:

patch A->B->C

We would like that only the last patch is build and not B and A

Jira-Id: JENKINS-70162
Jira-Id: JENKINS-72193
Jira-Id: JENKINS-71328
Jira-Id: JENKINS-70539
Jira-Id: JENKINS-69338
Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>
@panicking panicking changed the title Fix topic cancelling patches Should fix [JENKINS-70162] [JENKINS-72193] [JENKINS-70539] [JENKINS-69338] Fix topic cancelling patches (this close races in abortBuild) Feb 20, 2024
@rsandell
Copy link
Member

Looks like the build was taking too long and got aborted.

@panicking
Copy link
Contributor Author

@rsandell Do you have time to review patches? Like the UI change and this one? I have already deployed both in two instance

@rsandell rsandell added the bug label Mar 8, 2024
@rsandell rsandell merged commit 6fe554e into jenkinsci:master Mar 8, 2024
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
2 participants