From 63279799336fa99bb8bbb908084017173ed44802 Mon Sep 17 00:00:00 2001
From: Tim Jaacks <tim.jaacks@garz-fricke.com>
Date: Fri, 17 Dec 2021 23:10:06 +0100
Subject: [PATCH] deploy_gitlab_ci: trigger pipeline only if it has not run
before
---
deploy_gitlab_ci.py | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/deploy_gitlab_ci.py b/deploy_gitlab_ci.py
index e46d601..5d7d8ba 100755
--- a/deploy_gitlab_ci.py
+++ b/deploy_gitlab_ci.py
@@ -64,7 +64,7 @@ def main():
project = common.get_project(gitlab, args.project)
# Update submodule
- integration_branch, _, submodule_project = update_submodule(
+ integration_branch, integration_commit, submodule_project = update_submodule(
project, args.submodule, args.revision, args.branch
)
@@ -91,12 +91,13 @@ def main():
else:
print("Existing integration merge request:\n%s" % mr.web_url)
- # Explicitly trigger a pipeline on the integration branch (automatic pipelines are
- # disabled for integration merge requests)
- try:
- project.pipelines.create({"ref": integration_branch})
- except GitlabCreateError as e:
- sys.exit("ERROR: could not create merge request pipeline: %s" % e)
+ # Explicitly trigger a pipeline on the integration branch if it has not run for the
+ # head commit yet (automatic pipelines are disabled for integration branches)
+ if not project.pipelines.list(sha=integration_commit):
+ try:
+ project.pipelines.create({"ref": integration_branch})
+ except GitlabCreateError as e:
+ sys.exit("ERROR: could not create merge request pipeline: %s" % e)
if not args.merge:
print(
--
GitLab