Skip to content

Commit

Permalink
Add FreeBSD factory
Browse files Browse the repository at this point in the history
  • Loading branch information
vladbogo committed Nov 23, 2023
1 parent eab1e3c commit dce20ea
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
12 changes: 11 additions & 1 deletion master-nonlatent/master.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -948,6 +948,15 @@ f_macos.addStep(
)
)

# f_freebsd
f_freebsd = getQuickBuildFactory(mtrDbPool)
f_freebsd.addStep(
steps.ShellCommand(
name="cleanup",
command="rm -r /mnt/packages/* /buildbot/* 2> /dev/null || true",
alwaysRun=True,
)
)

####### BUILDERS LIST
c["builders"] = []
Expand Down Expand Up @@ -1027,8 +1036,9 @@ c["builders"].append(
workernames=["hz-freebsd-bbw1"],
tags=["FreeBSD", "quick"],
collapseRequests=True,
properties={"additional_args": "-DPLUGIN_ROCKSDB=NO"},
nextBuild=nextBuild,
factory=f_quick_build,
factory=f_freebsd,
)
)

Expand Down
4 changes: 2 additions & 2 deletions utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def envFromProperties(envlist):


def getScript(scriptname):
branch=os.getenv("BRANCH", default="main")
branch = os.getenv("BRANCH", default="main")
return steps.ShellCommand(
name=f"fetch_{scriptname}",
command=[
Expand Down Expand Up @@ -153,7 +153,7 @@ def downloadSourceTarball(output_dir="/mnt/packages/"):
# Do not use flock for AIX
os=$(uname -s)
use_flock=""
if [[ $os != "AIX" && $os != "Darwin" ]]; then
if [[ $os != "AIX" && $os != "Darwin" && $os != "FreeBSD" ]]; then
use_flock="flock \"$d$f\" "
fi
cmd="$use_flock wget -cO \"$d$f\" \""""
Expand Down

0 comments on commit dce20ea

Please sign in to comment.