From 4b2015b974666ab11c674546deb1678a41441402 Mon Sep 17 00:00:00 2001
From: Walter Lozano <walter.lozano@collabora.com>
Date: Thu, 20 Mar 2025 09:00:36 -0300
Subject: [PATCH 1/7] analyse-rebases: Enable automerge when no update
A possible scenario during a rebase is that a package has no update, in
which case, usually the automerge-trivial argument allow the MR to be
merged. However, for this to work the package need also to have
trivial changes, which means no delta.
In the case of a delta, it should be reviewed to make sure it is still
valid, however, this can be done later to unblock the rebase.
To support this behavior introduce a new argument to automerge MR
when the package has no update. Also, add a log to allow to generate a
list of packages to be reviewed later.
Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
---
rebase-scripts/analyse-rebases.py | 69 ++++++++++++++++++++++++-------
1 file changed, 54 insertions(+), 15 deletions(-)
diff --git a/rebase-scripts/analyse-rebases.py b/rebase-scripts/analyse-rebases.py
index d92039e..f56b821 100755
--- a/rebase-scripts/analyse-rebases.py
+++ b/rebase-scripts/analyse-rebases.py
@@ -11,11 +11,26 @@ import logging
import json
import base64
+DEBIAN_RELEASES = ['buster', 'bullseye', 'bookworm', 'trixie', 'forky']
+DEBIAN_BRANCHES = ['debian/' + x for x in DEBIAN_RELEASES ]
+
+def old_debian_branch(debian_branch):
+ if not debian_branch in DEBIAN_BRANCHES:
+ return None
+
+ index = DEBIAN_BRANCHES.index(debian_branch) - 1
+
+ if index >= 0 and index < len(DEBIAN_BRANCHES):
+ return DEBIAN_BRANCHES[index]
+
+ return None
+
class MergeData:
- def __init__(self, mr_url, component, trivial_merge, failed_merge, changes_url, pipeline_url, pipeline_status, failed_jobs, project_id, merge_request_iid):
+ def __init__(self, mr_url, component, trivial_merge, no_update_merge, failed_merge, changes_url, pipeline_url, pipeline_status, failed_jobs, project_id, merge_request_iid):
self.mr_url = mr_url
self.component = component
self.trivial_merge = trivial_merge
+ self.no_update_merge = no_update_merge
self.failed_merge = failed_merge
self.changes_url = changes_url
self.pipeline_url = pipeline_url
@@ -25,21 +40,22 @@ class MergeData:
self.merge_request_iid = merge_request_iid
def __str__(self):
- if self.trivial_merge:
+ if self.trivial_merge or self.no_update_merge:
if self.pipeline_status == "success":
- prefix = "🚀 Trivial"
+ prefix = "🚀"
else:
- prefix = "😿 Trivial but failed"
+ prefix = "😿"
+ prefix += f" Trivial: {self.trivial_merge}, No update: {self.no_update_merge}, Pipeline: {self.pipeline_status}"
elif self.failed_merge:
- prefix = "âš ï¸ Automated merge failed:"
+ prefix = "âš ï¸ Automated merge failed"
else:
- prefix = "🚨 To check:"
+ prefix = "🚨 To check"
failed = ""
if self.failed_jobs:
failed = f" (failed: {self.failed_jobs})"
- return f"{prefix}: {self.mr_url} - {self.component} - pipeline: {self.pipeline_status}{failed}, {self.pipeline_url} - changes: {self.changes_url}"
+ return f"{prefix} - {self.component} - {self.mr_url} - {failed} - {self.pipeline_url} - {self.changes_url}"
class Analyser:
def __init__(self, group):
@@ -55,6 +71,19 @@ class Analyser:
self.gl = gitlab.Gitlab.from_config(gitlab_instance)
self.gl.auth()
+ def no_upstream_update(self, project, debian):
+ old_debian = old_debian_branch(debian)
+ try:
+ debian_id = project.branches.get(debian).commit['id']
+ old_debian_id = project.branches.get(old_debian).commit['id']
+ except:
+ return False
+
+ if debian_id == old_debian_id:
+ return True
+
+ return False
+
def merge(self, data):
project = self.gl.projects.get(data.project_id, lazy=True)
pmr = project.mergerequests.get(data.merge_request_iid, access_raw_diffs=False, lazy=False)
@@ -74,7 +103,7 @@ class Analyser:
p = project.pipelines.get(p.id)
p.retry()
- def analyse_mr(self, mr, debian, automerge_trivial, retry_obs):
+ def analyse_mr(self, mr, debian, automerge_trivial, automerge_no_update, retry_obs):
logging.debug(f"Analyzing {mr.web_url}")
project = self.gl.projects.get(mr.project_id, lazy=True)
@@ -91,6 +120,11 @@ class Analyser:
except:
pass
+ no_update_merge = False
+ if self.no_upstream_update(project, debian):
+ logging.debug(f"Found a no update merge: {no_update_merge}")
+ no_update_merge = True
+
cmp = project.repository_compare(debian, pmr.source_branch)
logging.debug(f"Changes url: {cmp['web_url']}")
trivial_merge = True
@@ -119,18 +153,21 @@ class Analyser:
logging.debug(f"Pipeline jobs that failed: {failed_jobs}")
logging.debug(f"Found a trivial merge: {trivial_merge}")
- m = MergeData(mr.web_url, component, trivial_merge, failed_merge, cmp['web_url'], p.web_url, p.status, failed_jobs, mr.project_id, mr.iid)
+ m = MergeData(mr.web_url, component, trivial_merge, no_update_merge, failed_merge, cmp['web_url'], p.web_url, p.status, failed_jobs, mr.project_id, mr.iid)
logging.info(m)
if automerge_trivial and m.trivial_merge and m.pipeline_status == 'success':
self.merge(m)
+ if automerge_no_update and m.no_update_merge and m.pipeline_status == 'success':
+ self.merge(m)
+
if retry_obs and m.pipeline_status == 'failed' and len(m.failed_jobs) > 0 and m.failed_jobs[0].startswith(('obs','upload')):
self.retry_pipeline(m)
return m
- def process_mr_list(self, target, debian, user, max_merges = None, automerge_trivial = False, retry_obs = False):
+ def process_mr_list(self, target, debian, user, max_merges = None, automerge_trivial = False, automerge_no_update = False, retry_obs = False):
merges = []
group = self.gl.groups.get(f"{self.group}", lazy=True)
for mr in group.mergerequests.list(state = "opened", iterator=True, lazy = True):
@@ -143,7 +180,7 @@ class Analyser:
break
max_merges -= 1
- data = self.analyse_mr(mr, debian, automerge_trivial, retry_obs)
+ data = self.analyse_mr(mr, debian, automerge_trivial, automerge_no_update, retry_obs)
merges.append(data)
return merges
@@ -172,6 +209,8 @@ if __name__ == "__main__":
default = None)
parser.add_argument('--automerge-trivial',
action='store_true')
+ parser.add_argument('--automerge-no-update',
+ action='store_true')
parser.add_argument('--debian-branch',
default = 'debian/trixie',
help = 'Debian upstream branch to use')
@@ -202,13 +241,13 @@ if __name__ == "__main__":
a = Analyser(args.group)
a.connect(args.gitlab_instance, args.gitlab_server_url, args.gitlab_api_token)
merges = a.process_mr_list(args.apertis_target_branch, args.debian_branch, args.filter_user, args.max_merges,
- args.automerge_trivial, args.retry_obs)
+ args.automerge_trivial, args.automerge_no_update, args.retry_obs)
logging.info(f"Total merges analyzed: {len(merges)}")
- logging.info(f"Total trivial merges with happy pipelines: {len(list(filter(lambda m: m.trivial_merge and m.pipeline_status == 'success', merges)))}")
- logging.info(f"Total trivial merges with unhappy pipelines: {len(list(filter(lambda m: m.trivial_merge and m.pipeline_status != 'success', merges)))}")
+ logging.info(f"Total trivial/no update merges with happy pipelines: {len(list(filter(lambda m: (m.trivial_merge or m.no_update_merge) and m.pipeline_status == 'success', merges)))}")
+ logging.info(f"Total trivial/no update merges with unhappy pipelines: {len(list(filter(lambda m: (m.trivial_merge or m.no_update_merge) and m.pipeline_status != 'success', merges)))}")
logging.info(f"Automated merge failures: {len(list(filter(lambda m: m.failed_merge, merges)))}")
- logging.info(f"Non-trivial merges: {len(list(filter(lambda m: not m.trivial_merge and not m.failed_merge, merges)))}")
+ logging.info(f"Non-trivial and update merges: {len(list(filter(lambda m: not m.trivial_merge and not m.no_update_merge and not m.failed_merge, merges)))}")
if args.json:
print(json.dumps(merges, default = lambda x: x.__dict__))
--
GitLab
From f2b986d8cffab4e73c5e4160fb2187cf57f5df1d Mon Sep 17 00:00:00 2001
From: Walter Lozano <walter.lozano@collabora.com>
Date: Mon, 24 Mar 2025 11:37:15 -0300
Subject: [PATCH 2/7] analyse-rebases: Improve output
In order to easily understand the logs, restructure the entries to have,
showing MR first, and skipping useless data.
Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
---
rebase-scripts/analyse-rebases.py | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/rebase-scripts/analyse-rebases.py b/rebase-scripts/analyse-rebases.py
index f56b821..04ec0c8 100755
--- a/rebase-scripts/analyse-rebases.py
+++ b/rebase-scripts/analyse-rebases.py
@@ -42,20 +42,23 @@ class MergeData:
def __str__(self):
if self.trivial_merge or self.no_update_merge:
if self.pipeline_status == "success":
- prefix = "🚀"
+ entry = f"🚀 {self.mr_url}, "
else:
- prefix = "😿"
- prefix += f" Trivial: {self.trivial_merge}, No update: {self.no_update_merge}, Pipeline: {self.pipeline_status}"
+ entry = f"😿 {self.mr_url}, "
+ entry += f"Trivial: {self.trivial_merge}, No update: {self.no_update_merge}, Pipeline: {self.pipeline_status}, "
elif self.failed_merge:
- prefix = "âš ï¸ Automated merge failed"
+ entry = f"âš ï¸ {self.mr_url}, Automated merge failed, "
else:
- prefix = "🚨 To check"
+ entry = f"🚨 {self.mr_url}, To check, "
+
+ entry += f"{self.component}, "
- failed = ""
if self.failed_jobs:
- failed = f" (failed: {self.failed_jobs})"
+ entry += f" (failed: {self.failed_jobs})"
+
+ entry += f"{self.pipeline_url}, {self.changes_url}"
- return f"{prefix} - {self.component} - {self.mr_url} - {failed} - {self.pipeline_url} - {self.changes_url}"
+ return entry
class Analyser:
def __init__(self, group):
--
GitLab
From 6fdea4138279cab485a95981395c48f29cefad40 Mon Sep 17 00:00:00 2001
From: Walter Lozano <walter.lozano@collabora.com>
Date: Wed, 19 Mar 2025 23:30:16 -0300
Subject: [PATCH 3/7] analyse-missing-packages: Enable trigger pipelines when
no update
A possible scenario during a rebase is that a package has no update, in
which case, usually the trigger-trivial argument allow the pipeline to
be created. However, for this to work the package need also to have
trivial changes, which means no delta.
In the case of a delta, it should be reviewed to make sure it is still
valid, however, this can be done later to unblock the rebase.
To support this behavior introduce a new argument to trigger a pipeline
when the package has no update. Also, add a log to allow to generate a
list of packages to be reviewed later.
Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
---
rebase-scripts/analyse-missing-packages.py | 48 +++++++++++++++++++---
1 file changed, 42 insertions(+), 6 deletions(-)
diff --git a/rebase-scripts/analyse-missing-packages.py b/rebase-scripts/analyse-missing-packages.py
index 9b0e1b3..3269367 100755
--- a/rebase-scripts/analyse-missing-packages.py
+++ b/rebase-scripts/analyse-missing-packages.py
@@ -17,6 +17,20 @@ RENAMED = {
"libpcre++": "libpcrexx",
}
+DEBIAN_RELEASES = ['buster', 'bullseye', 'bookworm', 'trixie', 'forky']
+DEBIAN_BRANCHES = ['debian/' + x for x in DEBIAN_RELEASES ]
+
+def old_debian_branch(debian_branch):
+ if not debian_branch in DEBIAN_BRANCHES:
+ return None
+
+ index = DEBIAN_BRANCHES.index(debian_branch) - 1
+
+ if index >= 0 and index < len(DEBIAN_BRANCHES):
+ return DEBIAN_BRANCHES[index]
+
+ return None
+
class Analyser:
def __init__(self, group):
self.gl = None
@@ -31,10 +45,26 @@ class Analyser:
self.gl = gitlab.Gitlab.from_config(gitlab_instance)
self.gl.auth()
+ def no_upstream_update(self, project, debian):
+ old_debian = old_debian_branch(debian)
+ try:
+ debian_id = project.branches.get(debian).commit['id']
+ old_debian_id = project.branches.get(old_debian).commit['id']
+ except:
+ return False
+
+ if debian_id == old_debian_id:
+ return True
+
+ return False
+
def analyse_diff(self, project, target, debian):
cmp = project.repository_compare(debian, target)
logging.debug(f"Changes url: {cmp['web_url']}")
trivial_merge = True
+ no_update_merge = False
+ if self.no_upstream_update(project, debian):
+ no_update_merge = True
for d in cmp['diffs']:
old = d['old_path']
new = d['new_path']
@@ -45,14 +75,14 @@ class Analyser:
else:
logging.debug(f"File move: {old} -> {new}")
trivial_merge = False
- return (trivial_merge, cmp['web_url'])
+ return (trivial_merge, no_update_merge, cmp['web_url'])
def analyse_component(self, project, target):
component = project.files.raw(file_path='debian/apertis/component', ref=target).decode('ascii').strip()
return component
- def analyse_package(self, package, target, debian, trigger_trivial = False, label = None):
+ def analyse_package(self, package, target, debian, trigger_trivial = False, trigger_no_update = False, label = None):
logging.debug(f"Analysing {package}")
package = RENAMED.get(package, package)
logging.debug(f"Analysing {package}")
@@ -103,9 +133,11 @@ class Analyser:
if p.status == "success":
logging.info(f"{project.web_url} already merged and happy pipeline, component: {component}")
else:
- (trivial, changes) = self.analyse_diff(project, target, debian);
- logging.info(f"{project.web_url} already merged but unhappy: {p.web_url} - {p.status} - trivial: {trivial} changes: {changes}, component: {component}")
- if p.status == 'skipped' and trivial and trigger_trivial:
+ (trivial, no_update, changes) = self.analyse_diff(project, target, debian);
+ logging.info(f"{project.web_url} already merged but unhappy: {p.web_url} - {p.status} - trivial: {trivial} no_update: {no_update} changes: {changes}, component: {component}")
+ if p.status == 'skipped' and (
+ trivial and trigger_trivial or
+ no_update and trigger_no_update):
project.pipelines.create({'ref': target})
logging.info(f"{project.web_url} pipeline created!!")
@@ -152,6 +184,9 @@ if __name__ == "__main__":
parser.add_argument('--trigger-trivial',
action='store_true',
help = 'trigger trivial pipelines')
+ parser.add_argument('--trigger-no-update',
+ action='store_true',
+ help = 'trigger pipelines when no update is available')
parser.add_argument('--debian-branch',
default = 'debian/trixie',
help = 'Debian upstream branch to use')
@@ -177,4 +212,5 @@ if __name__ == "__main__":
missing = open(args.missing);
for l in missing.readlines():
package = l.rstrip();
- a.analyse_package(package, args.apertis_target_branch, args.debian_branch, args.trigger_trivial, args.label)
+ a.analyse_package(package, args.apertis_target_branch, args.debian_branch,
+ args.trigger_trivial, args.trigger_no_update, args.label)
--
GitLab
From 2b259cc96c7d4bda5a75f7737e3d9ae5f350e502 Mon Sep 17 00:00:00 2001
From: Walter Lozano <walter.lozano@collabora.com>
Date: Thu, 20 Mar 2025 23:10:28 -0300
Subject: [PATCH 4/7] analyse-missing-packages: Support retry failed pipelines
In situations of high load Gitlab might work as expected and several
pipelines can fail. In order to easily recover from this situation
add the support to retry them.
Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
---
rebase-scripts/analyse-missing-packages.py | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/rebase-scripts/analyse-missing-packages.py b/rebase-scripts/analyse-missing-packages.py
index 3269367..66a8d11 100755
--- a/rebase-scripts/analyse-missing-packages.py
+++ b/rebase-scripts/analyse-missing-packages.py
@@ -82,7 +82,7 @@ class Analyser:
return component
- def analyse_package(self, package, target, debian, trigger_trivial = False, trigger_no_update = False, label = None):
+ def analyse_package(self, package, target, debian, trigger_trivial = False, trigger_no_update = False, retry_failed = False, label = None):
logging.debug(f"Analysing {package}")
package = RENAMED.get(package, package)
logging.debug(f"Analysing {package}")
@@ -140,6 +140,9 @@ class Analyser:
no_update and trigger_no_update):
project.pipelines.create({'ref': target})
logging.info(f"{project.web_url} pipeline created!!")
+ elif p.status == 'failed' and retry_failed:
+ logging.info('Retrying...')
+ p.retry()
return
logging.info(f"{project.web_url} is already merged, but no pipeline, component: {component}")
@@ -198,6 +201,9 @@ if __name__ == "__main__":
parser.add_argument('--group',
default = 'pkg',
help = 'Gitlab group were package are stored')
+ parser.add_argument('--retry-failed',
+ action='store_true',
+ help = 'Retry failed pipelines')
parser.add_argument('--label',
default = '',
help = 'Apply a label to the MR if present')
@@ -213,4 +219,5 @@ if __name__ == "__main__":
for l in missing.readlines():
package = l.rstrip();
a.analyse_package(package, args.apertis_target_branch, args.debian_branch,
- args.trigger_trivial, args.trigger_no_update, args.label)
+ args.trigger_trivial, args.trigger_no_update, args.retry_failed,
+ args.label)
--
GitLab
From cf0a058334d3747fd5059bb07abe799d0ad39159 Mon Sep 17 00:00:00 2001
From: Walter Lozano <walter.lozano@collabora.com>
Date: Mon, 24 Mar 2025 11:14:03 -0300
Subject: [PATCH 5/7] analyse-missing-packages: Show stats
To be able to meassure the progress, show stats about the issues with
the missing packages.
Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
---
rebase-scripts/analyse-missing-packages.py | 111 +++++++++++++++++----
1 file changed, 94 insertions(+), 17 deletions(-)
diff --git a/rebase-scripts/analyse-missing-packages.py b/rebase-scripts/analyse-missing-packages.py
index 66a8d11..2f6862a 100755
--- a/rebase-scripts/analyse-missing-packages.py
+++ b/rebase-scripts/analyse-missing-packages.py
@@ -31,6 +31,48 @@ def old_debian_branch(debian_branch):
return None
+class MissingData():
+ def __init__(self, package = None, error = None, package_url = None, component = None,
+ mr_url = None, trivial = False, no_update = False,
+ changes_url = None, pipeline_url = None,
+ pipeline_status = None):
+ self.package = package
+ self.error = error
+ self.package_url = package_url
+ self.component = component
+
+ self.mr_url = mr_url
+ self.trivial = trivial
+ self.no_update = no_update
+ self.changes_url = changes_url
+ self.pipeline_url = pipeline_url
+ self.pipeline_status = pipeline_status
+
+ def __str__(self):
+ if not self.error:
+ entry = f"✅ "
+ elif not self.mr_url:
+ if self.trivial or self.no_update:
+ if self.pipeline_status == "success":
+ entry = "🚀 "
+ else:
+ entry = "😿 "
+ else:
+ entry = "âš ï¸ "
+ elif self.mr_url:
+ entry = "🚨 "
+
+ entry += f"{self.package}, {self.error}, {self.component}, "
+ if self.pipeline_status and self.pipeline_status != 'failed':
+ entry += f" trivial: {self.trivial}, no_update: {self.no_update}, "
+ if self.pipeline_status:
+ entry += f"pipeline: {self.pipeline_status}, {self.pipeline_url}"
+ if self.mr_url:
+ entry += f"{self.mr_url}, "
+ if self.changes_url:
+ entry += f"{self.changes_url}"
+ return entry
+
class Analyser:
def __init__(self, group):
self.gl = None
@@ -90,13 +132,15 @@ class Analyser:
try:
project = self.gl.projects.get(f"{self.group}/{package}")
except:
- logging.info(f"{package} has no project on gitlab")
- return
+ d = MissingData(package, 'No project')
+ logging.info(d)
+ return d
# Check if the package has an open MR against the target
for mr in project.mergerequests.list(iterator=True, lazy=True):
if mr.target_branch == target and mr.state == 'opened':
- logging.info(f"{project.web_url} has an open MR - {mr.web_url}")
+ d = MissingData(package, "Open MR", project.web_url, mr_url = mr.web_url)
+ logging.info(d)
if label:
if label == "!":
mr.labels = []
@@ -105,19 +149,21 @@ class Analyser:
else:
mr.labels.append(label)
mr.save()
- return
+ return d
try:
target_branch = project.branches.get(target)
except:
- logging.info(f"{project.web_url} is missing an {target} branch")
- return
+ d = MissingData(package, f"Missing {target} branch", project.web_url)
+ logging.info(d)
+ return d
try:
debian_branch = project.branches.get(debian)
except:
- logging.info(f"{project.web_url} is missing an {debian} branch")
- return
+ d = MissingData(package, f"Missing {debian} branch", project.web_url)
+ logging.info(d)
+ return d
component = self.analyse_component(project, target)
@@ -131,10 +177,15 @@ class Analyser:
if p.ref == target:
p = project.pipelines.get(p.id)
if p.status == "success":
- logging.info(f"{project.web_url} already merged and happy pipeline, component: {component}")
+ d = MissingData(package, None, project.web_url, component)
+ logging.info(d)
else:
(trivial, no_update, changes) = self.analyse_diff(project, target, debian);
- logging.info(f"{project.web_url} already merged but unhappy: {p.web_url} - {p.status} - trivial: {trivial} no_update: {no_update} changes: {changes}, component: {component}")
+ d = MissingData(package, f"Merged but unhappy", project.web_url,
+ component, trivial = trivial, no_update = no_update,
+ changes_url = changes, pipeline_url = p.web_url,
+ pipeline_status = p.status)
+ logging.info(d)
if p.status == 'skipped' and (
trivial and trigger_trivial or
no_update and trigger_no_update):
@@ -144,9 +195,11 @@ class Analyser:
logging.info('Retrying...')
p.retry()
- return
- logging.info(f"{project.web_url} is already merged, but no pipeline, component: {component}")
- return
+ return d
+ d = MissingData(package, f"Merged but no pipeline", project.web_url,
+ component)
+ logging.info(d)
+ return d
# Check if the last pipeline for the debian branch succeeded
pipeline = None
@@ -155,11 +208,14 @@ class Analyser:
pipeline = p
if pipeline == None:
- logging.info(f"{project.web_url} is a missing pipeline for {debian} branch ")
- return
+ d = MissingData(package, f"Missing {debian} pipeline", project.web_url)
+ logging.info(d)
+ return d
- logging.info(f"{project.web_url} is missing an MR")
+ d = MissingData(package, f"Missing MR", project.web_url)
+ logging.info(d)
+ return d
if __name__ == "__main__":
parser = argparse.ArgumentParser(
@@ -216,8 +272,29 @@ if __name__ == "__main__":
a = Analyser(args.group)
a.connect(args.gitlab_instance, args.gitlab_server_url, args.gitlab_api_token)
missing = open(args.missing);
+ missing_data = []
for l in missing.readlines():
package = l.rstrip();
- a.analyse_package(package, args.apertis_target_branch, args.debian_branch,
+ md = a.analyse_package(package, args.apertis_target_branch, args.debian_branch,
args.trigger_trivial, args.trigger_no_update, args.retry_failed,
args.label)
+ missing_data.append(md)
+
+ total = len(missing_data)
+ logging.info(f"Total missing packages analyzed: {total}")
+ happy = len(list(filter(lambda m: not m.error, missing_data)))
+ logging.info(f"Total happy packages: {happy}")
+ missing = total - happy
+ missing_type = len(list(filter(lambda m: not m.mr_url and m.trivial and m.pipeline_status == 'success', missing_data)))
+ logging.info(f"Total trivial/no update with happy pipelines: {missing_type}")
+ missing -= missing_type
+ missing_type = len(list(filter(lambda m: not m.mr_url and (m.trivial or m.no_update) and m.pipeline_status != 'success', missing_data)))
+ logging.info(f"Total trivial/no update with unhappy pipelines: {missing_type}")
+ missing -= missing_type
+ missing_type = len(list(filter(lambda m: not m.mr_url and not m.trivial and m.no_update, missing_data)))
+ logging.info(f"Non-trivial and update: {missing_type}")
+ missing -= missing_type
+ missing_type = len(list(filter(lambda m: m.mr_url, missing_data)))
+ logging.info(f"Open MR: {missing_type}")
+ missing -= missing_type
+ logging.info(f"Other errors: {missing}")
\ No newline at end of file
--
GitLab
From d03847ff571c61d308fadb3460e7271f00db05ba Mon Sep 17 00:00:00 2001
From: Walter Lozano <walter.lozano@collabora.com>
Date: Mon, 24 Mar 2025 11:17:42 -0300
Subject: [PATCH 6/7] analyse-missing-packages: Support json output
To have more structured data, add json support.
Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
---
rebase-scripts/analyse-missing-packages.py | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/rebase-scripts/analyse-missing-packages.py b/rebase-scripts/analyse-missing-packages.py
index 2f6862a..cfdd27c 100755
--- a/rebase-scripts/analyse-missing-packages.py
+++ b/rebase-scripts/analyse-missing-packages.py
@@ -7,6 +7,7 @@ import gitlab.v4.objects
import time
import argparse
import logging
+import json
RENAMED = {
"dbus-c++": "dbus-cxx",
@@ -263,6 +264,9 @@ if __name__ == "__main__":
parser.add_argument('--label',
default = '',
help = 'Apply a label to the MR if present')
+ parser.add_argument('--json',
+ action='store_true',
+ help = "Be quiet and results as json")
args = parser.parse_args()
logging.basicConfig(format='%(asctime)s %(message)s',
@@ -297,4 +301,7 @@ if __name__ == "__main__":
missing_type = len(list(filter(lambda m: m.mr_url, missing_data)))
logging.info(f"Open MR: {missing_type}")
missing -= missing_type
- logging.info(f"Other errors: {missing}")
\ No newline at end of file
+ logging.info(f"Other errors: {missing}")
+
+ if args.json:
+ print(json.dumps(missing_data, default = lambda x: x.__dict__))
--
GitLab
From 77e22544171c2def940b0c1ad1696f9ac3bb5a02 Mon Sep 17 00:00:00 2001
From: Walter Lozano <walter.lozano@collabora.com>
Date: Mon, 24 Mar 2025 12:21:58 -0300
Subject: [PATCH 7/7] analyse-missing-packages: Implement max limit
The tool provides max-merges argument to limit the amount of data is
processed, but the functionality is not implemented. At the same time
the name of the argument is confusing, since the tools checks for missing
packages.
To fix the issue, implement a max limit with max-missing argument.
Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
---
rebase-scripts/analyse-missing-packages.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/rebase-scripts/analyse-missing-packages.py b/rebase-scripts/analyse-missing-packages.py
index cfdd27c..15a5300 100755
--- a/rebase-scripts/analyse-missing-packages.py
+++ b/rebase-scripts/analyse-missing-packages.py
@@ -238,7 +238,7 @@ if __name__ == "__main__":
help="print debug information",
)
- parser.add_argument('--max-merges',
+ parser.add_argument('--max-missing',
type=int,
default = None)
parser.add_argument('--trigger-trivial',
@@ -277,7 +277,12 @@ if __name__ == "__main__":
a.connect(args.gitlab_instance, args.gitlab_server_url, args.gitlab_api_token)
missing = open(args.missing);
missing_data = []
+ max_missing = args.max_missing
for l in missing.readlines():
+ if max_missing != None:
+ if max_missing <= 0:
+ break
+ max_missing -= 1
package = l.rstrip();
md = a.analyse_package(package, args.apertis_target_branch, args.debian_branch,
args.trigger_trivial, args.trigger_no_update, args.retry_failed,
--
GitLab