Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 0 additions & 17 deletions common_factories.py
Original file line number Diff line number Diff line change
Expand Up @@ -861,23 +861,6 @@ def getDebAutobakeFactory() -> util.BuildFactory:
doStepIf=lambda step: hasDockerLibrary(step),
)
)
f_deb_autobake.addStep(
steps.Trigger(
name="release preparation",
schedulerNames=["s_release_prep"],
waitForFinish=True,
updateSourceStamp=False,
set_properties={
"tarbuildnum": Property("tarbuildnum"),
"mariadb_version": Property("mariadb_version"),
"master_branch": Property("master_branch"),
"parentbuildername": Property("buildername"),
},
doStepIf=(
lambda step: savePackageIfBranchMatch(step, SAVED_PACKAGE_BRANCHES)
),
)
)
f_deb_autobake.addStep(
steps.Trigger(
name="install",
Expand Down
1 change: 0 additions & 1 deletion configuration/builders/sequences/release.py
Original file line number Diff line number Diff line change
Expand Up @@ -416,4 +416,3 @@ def rpm_autobake(
# # TODO (Razvan): Future implementations
# def bintar(): ...
# def docker_library(): ...
# def release_preparation(): ...
27 changes: 0 additions & 27 deletions master-docker-nonstandard/master.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -276,24 +276,6 @@ for w in (6, 7):
save_packages=False,
)

## hz-bbw2-docker
c["workers"].append(
worker.DockerLatentWorker(
"release-prep-docker",
None,
docker_host=config["private"]["docker_workers"]["release-prep-docker"],
image=os.environ["CONTAINER_REGISTRY_URL"] + "debian12-release",
followStartupLogs=False,
autopull=True,
alwaysPull=True,
masterFQDN=FQDN,
hostconfig={"shm_size": "1G"},
max_builds=1,
build_wait_timeout=0,
properties={"jobs": 4, "save_packages": True},
)
)

####### FACTORY CODE

f_quick_build = getQuickBuildFactory("nm", mtrDbPool)
Expand Down Expand Up @@ -1249,12 +1231,3 @@ c["builders"].append(
)
)

c["builders"].append(
util.BuilderConfig(
name="release-prep",
workernames=["release-prep-docker"],
tags=["Release"],
collapseRequests=True,
factory=f_prep_local,
)
)
1 change: 0 additions & 1 deletion master-private.cfg-sample
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ private["docker_workers"]= {
"s390x-bbw6-docker":"tcp://IP_address:port", # ibm-s390x-ubuntu2404-01 (.39)
"s390x-bbw7-docker":"tcp://IP_address:port", # ibm-s390x-ubuntu2404-02 (.40)
"aws-bbw1-docker":"tcp://IP_address:port",
"release-prep-docker":"tcp://IP_address:port",
}

private["worker_name_mapping"] = {
Expand Down
1 change: 0 additions & 1 deletion schedulers_definition.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ def wordpressBuilders(props: IProperties) -> list[str]:
schedulers.Triggerable(name="s_eco", builderNames=ecoBuilders),
schedulers.Triggerable(name="s_dockerlibrary", builderNames=dockerLibraryBuilders),
schedulers.Triggerable(name="s_wordpress", builderNames=wordpressBuilders),
schedulers.Triggerable(name="s_release_prep", builderNames=["release-prep"]),
schedulers.Triggerable(
name="s_jepsen", builderNames=["amd64-ubuntu-2204-jepsen-mariadb"]
),
Expand Down