diff --git a/backend/configs/connectivity_tester.py b/backend/configs/connectivity_tester.py index f8afe27..abcd36d 100644 --- a/backend/configs/connectivity_tester.py +++ b/backend/configs/connectivity_tester.py @@ -1,7 +1,7 @@ from enironment import Environment from steps.checks import SimpleLog from steps.docker import DockerComposeBuild, DockerSwarmCheck, DockerSwarmDeploy -from steps.git import GitClone, CheckoutMerged +from steps.git import GitClone, CheckoutMerged, GitUnmerge from steps.shared_state import SharedStateHolderInMemory clone = GitClone(remotes=[ @@ -13,7 +13,8 @@ dockerSwarmCheck = DockerSwarmCheck( stack_name="connectivity_tester", ) -state = SharedStateHolderInMemory(unmerge=None) +unmerge = GitUnmerge(clone, dockerSwarmCheck) +state = SharedStateHolderInMemory(unmerge=unmerge) checkoutMerged = CheckoutMerged(clone, desired_branches=state,