fix(configs): drop unmerge step from pipeline

Same fix as hermes_infra.py — pass unmerge=None to SharedStateHolderInMemory
and skip the unmerge step entirely. Having unmerge=None in the pipeline
violates mypy's type signature (Pipeline expects AbstractStep, None
is not assignable), causing the brencher image build to fail at the
mypy step.

This is the same workaround as hermes_infra (PR #83): the stack is
managed via direct pushes, not via UI state, so unmerge is not needed.
This commit is contained in:
hermes
2026-09-20 17:44:32 +00:00
parent eccbfb8065
commit 65b2ef5325
+2 -4
View File
@@ -1,7 +1,7 @@
from enironment import Environment
from steps.checks import SimpleLog, UrlCheck
from steps.docker import DockerComposeBuild, DockerSwarmCheck, DockerSwarmDeploy
from steps.git import GitClone, CheckoutMerged, GitUnmerge
from steps.git import GitClone, CheckoutMerged
from steps.shared_state import SharedStateHolderInMemory
clone = GitClone(remotes=[
@@ -12,9 +12,8 @@ clone = GitClone(remotes=[
dockerSwarmCheck = DockerSwarmCheck(
stack_name="connectivity_tester",
)
unmerge = None
state = SharedStateHolderInMemory(unmerge=unmerge)
state = SharedStateHolderInMemory(unmerge=None)
checkoutMerged = CheckoutMerged(clone,
desired_branches=state,
@@ -66,7 +65,6 @@ connectivity_tester = Environment(
state,
checkoutMerged,
dockerSwarmCheck,
unmerge,
buildDocker,
deployDocker,
checkPing,