Produktionsziele können Merge-Commit und Entwicklungsbranch verlangen
PipelineManager Image / image (push) Successful in 2m25s

This commit is contained in:
Lars Stommer committed 2026-10-26 13:20:45 +01:00
1 parent a6e159d125
commit ee81eb31cb
2 files changed
+16

No files matched your search

+9
View File
@@ -231,6 +231,15 @@ def deploy(project, config, environment, archive, backup_root, transport_factory
current = git(project, "ls-remote", "origin", ref).split()
if not current or current[0] != revision:
raise PipelineError("Veralteter Auftrag; Branch wurde inzwischen weitergeschoben.")
if target.get("require_merge", False):
parents = git(project, "show", "-s", "--format=%P", "HEAD").split()
if len(parents) != 2:
raise PipelineError("Dieses Ziel benötigt einen Merge-Commit.")
if target.get("source_branch"):
try:
git(project, "merge-base", "--is-ancestor", parents[1], "origin/" + target["source_branch"])
except subprocess.CalledProcessError as error:
raise PipelineError("Merge stammt nicht vom vorgesehenen Entwicklungsbranch.") from error
checksum = inspect_package(archive, config, revision)
key_text = os.environ.get("DEPLOY_SSH_KEY", "")
known_text = os.environ.get("DEPLOY_KNOWN_HOSTS", "")
+7
View File
@@ -147,6 +147,13 @@ class ManagerTests(unittest.TestCase):
with self.assertRaisesRegex(PipelineError, "Veralteter"):
deploy(self.root, self.config, "staging", self.root / "missing", self.root)
def test_production_can_require_a_merge_instead_of_direct_commits(self):
self.config["targets"]["production"].update(enabled=True, require_merge=True)
with patch.dict(os.environ, {"GITHUB_REF": "refs/heads/main", "GITHUB_SHA": self.revision}):
with patch("manager.cli.git", side_effect=[self.revision, self.revision + "\trefs/heads/main", "b" * 40]):
with self.assertRaisesRegex(PipelineError, "Merge-Commit"):
deploy(self.root, self.config, "production", self.root / "missing", self.root)
def run_deployment(self, failure=None, healthy=True):
archive = self.package()
events = []