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

Jump to bottom

Refactor utils.py #637

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
+143 −156
Open

Refactor utils.py #637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d749f34
Refactor utils.py
cvicentiu Nov 26, 2024
d78def1
Make branch prioritisation more general with a sorting function
cvicentiu Nov 26, 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
8 changes: 4 additions & 4 deletions master-galera/master.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ def dpkgDeb():
"""
),
],
doStepIf=lambda step: savePackage(step, savedPackageBranches),
doStepIf=savePackage,
)


Expand All @@ -284,7 +284,7 @@ def rpmSave():
"""
),
],
doStepIf=lambda step: savePackage(step, savedPackageBranches),
doStepIf=savePackage,
)


Expand Down Expand Up @@ -366,7 +366,7 @@ EOF
""",
url=os.getenv("ARTIFACTS_URL", default="https://ci.mariadb.org"),
),
doStepIf=lambda step: savePackage(step, savedPackageBranches),
doStepIf=savePackage,
)
)
f_deb_build.addStep(
Expand Down Expand Up @@ -423,7 +423,7 @@ EOF
""",
url=os.getenv("ARTIFACTS_URL", default="https://ci.mariadb.org"),
),
doStepIf=lambda step: savePackage(step, savedPackageBranches),
doStepIf=savePackage,
)
)
f_rpm_build.addStep(
Expand Down
1 change: 1 addition & 0 deletions master-libvirt/master.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ sys.setrecursionlimit(10000)
sys.path.insert(0, "/srv/buildbot/master")

from utils import *
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we take that refactor opportunity to remove the wildcard import?

Copy link
Member Author

@cvicentiu cvicentiu Nov 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

master.cfg will come next, in a separate PR :)

from constants import os_info

# This is the dictionary that the buildmaster pays attention to. We also use
# a shorter alias to save typing.
Expand Down
3 changes: 0 additions & 3 deletions master-protected-branches/master.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,9 +422,6 @@ f_tarball.addStep(
doStepIf=lambda step: isStagingBranch(step),
)
)
# f_tarball.addStep(steps.ShellSequence( commands=[
# util.ShellArg(command=util.Interpolate("git checkout " + "%(prop:staging_branch)s"), logfile="rebase"),
# util.ShellArg(command=util.Interpolate("git merge %(prop:branch)s"), logfile="rebase")], workdir="build/server", haltOnFailure="true", doStepIf=ifStagingSucceeding))
f_tarball.addStep(
steps.ShellCommand(
name="cleanup", command="rm -r * .* 2> /dev/null || true", alwaysRun=True
Expand Down
Loading