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.

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

Collapse clean and non clean build requests on clean builders #266

Merged
merged 6 commits into from
Nov 12, 2024
Merged

Collapse clean and non clean build requests on clean builders #266

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6ece001
Collapse clean and non clean build requests on clean builders
DavidSpickett Sep 16, 2024
30087b1
Fix getattr default
DavidSpickett Oct 7, 2024
104d7d5
Handle clean like the other data passed in kwargs
DavidSpickett Oct 8, 2024
23eab2f
undo formatting change to unchanged code
DavidSpickett Oct 8, 2024
2dd5609
undo more formatting changes
DavidSpickett Oct 9, 2024
a734ce4
more formatting
DavidSpickett Oct 9, 2024
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
Prev Previous commit
Next Next commit
Fix getattr default
@DavidSpickett
DavidSpickett committed Oct 7, 2024
commit 30087b123514e378c153c31e374dcdd0287a5744
2 changes: 1 addition & 1 deletion zorg/buildbot/process/buildrequest.py
View file
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ def collapseRequests(master, builder, req1, req2):

# If the build is going to be a clean build anyway, we can collapse a clean
# build and a non-clean build.
if getattr(builder.config.factory, "clean"):
if getattr(builder.config.factory, "clean", False):
if 'clean_obj' in selfBuildsetPoperties:
del selfBuildsetPoperties["clean_obj"]
if 'clean_obj' in otherBuildsetPoperties: