diff --git a/common_factories.py b/common_factories.py index a95f6acfd..6c8de7bf7 100644 --- a/common_factories.py +++ b/common_factories.py @@ -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", diff --git a/configuration/builders/sequences/release.py b/configuration/builders/sequences/release.py index 2ea4c9332..84ce29436 100644 --- a/configuration/builders/sequences/release.py +++ b/configuration/builders/sequences/release.py @@ -416,4 +416,3 @@ def rpm_autobake( # # TODO (Razvan): Future implementations # def bintar(): ... # def docker_library(): ... -# def release_preparation(): ... diff --git a/master-docker-nonstandard/master.cfg b/master-docker-nonstandard/master.cfg index 5694ec95b..e477db737 100644 --- a/master-docker-nonstandard/master.cfg +++ b/master-docker-nonstandard/master.cfg @@ -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) @@ -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, - ) -) diff --git a/master-private.cfg-sample b/master-private.cfg-sample index fbc75f2cb..ada32e9c8 100644 --- a/master-private.cfg-sample +++ b/master-private.cfg-sample @@ -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"] = { diff --git a/schedulers_definition.py b/schedulers_definition.py index 1754d5032..d822c7a57 100644 --- a/schedulers_definition.py +++ b/schedulers_definition.py @@ -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"] ),