Merge strategy when multiple servers are used in the same repository

[SamuelMolling]

Hi folks,

I’m running two Atlantis servers against the same repository. Each one is configured to watch a different folder (so they don’t overlap in scope).

The issue is: when I open a PR that touches files from both folders, both servers run. If I trigger atlantis apply, Atlantis will merge the PR as soon as the first server finishes successfully — even if the other one fails.

This is a problem because the PR gets merged while half of the changes are broken.

Has anyone faced this before? Is there a way to enforce that all Atlantis servers must pass before the PR is merged? Or any best practices/workarounds to handle multi-server setups like this?
Thanks in advance!

[romuloslv]

Hey, @SamuelMolling

Have you tried creating a branch protection rule that depends on both status checks (Atlantis A/B)?
You can also disable automerge when an apply is successfully executed.