Merge ~roxanan/+git/kteam-tools:cowboy/master into ~canonical-kernel/+git/kteam-tools:cowboy/master

[Roxana Nicolescu]

Unmerged commits

253defe... by Roxana Nicolescu on 2024-02-14

wfl/wft/syn_prepare_packages.py: Include MM notification for peer-review

If the kernel is ready for peer-review, notify the peer-reviewer on MM.

Signed-off-by: Roxana Nicolescu <email address hidden>

c1d913a... by Roxana Nicolescu on 2024-02-14

stable/wfl/bug: Add peer-reviewer property

WorkflowBug objects contain the cycle reference, the series and name of
the kernel. Based on this, peer-reviewer can be easily retrieved by
looking at KernelSeries for the specific cycle.

Signed-off-by: Roxana Nicolescu <email address hidden>

998cc23... by Roxana Nicolescu on 2024-02-08

ktl/kernel-series: Add peer_reviewer property

kernel-series.yaml now source entries may have a peer-reviewer entry.
This is needed so that swm knows who's peer-reviewing a kernel and
properly annouce the notification in MM.

Signed-off-by: Roxana Nicolescu <email address hidden>

99da89f... by Andy Whitcroft on 2024-02-13

auto-prepare: apply local delta early

Signed-off-by: Andy Whitcroft <email address hidden>

a36aa89... by Andy Whitcroft on 2024-02-13

swm: wfl/work -- send admin data to the right place

Signed-off-by: Andy Whitcroft <email address hidden>

2864374... by Andy Whitcroft on 2024-02-12

swm: wfl/work -- apply black

Signed-off-by: Andy Whitcroft <email address hidden>

8d9e28c... by Andy Whitcroft on 2024-02-12

swm: wfl/work -- de-duplicate message submission code

Signed-off-by: Andy Whitcroft <email address hidden>

3238656... by Andy Whitcroft on 2024-02-12

swm: package -- drop legacy debs cache

Signed-off-by: Andy Whitcroft <email address hidden>

87e03b3... by Andy Whitcroft on 2024-02-12

swm: package -- switch to PackageBuildRoute support exclusively (remainder)

Signed-off-by: Andy Whitcroft <email address hidden>

41392e2... by Andy Whitcroft on 2024-02-12

swm: wft/promote-to-updates -- report superseded binaries in Updates

Signed-off-by: Andy Whitcroft <email address hidden>

diff --git a/ktl/kernel_series.py b/ktl/kernel_series.py
index 0c1895c..c675e1b 100644
--- a/ktl/kernel_series.py
+++ b/ktl/kernel_series.py
@@ -459,6 +459,10 @@ class KernelSourceEntry:
         return self._data.get('owner', None)
 
     @property
+    def peer_reviewer(self):
+        return self._data.get('peer-reviewer', None)
+
+    @property
     def stakeholder(self):
         return self._data.get('stakeholder', None)
 
diff --git a/ktl/tests/test_kernel_series.py b/ktl/tests/test_kernel_series.py
index 9444283..5de80cb 100644
--- a/ktl/tests/test_kernel_series.py
+++ b/ktl/tests/test_kernel_series.py
@@ -1451,6 +1451,43 @@ class TestKernelSourceEntry(TestKernelSeriesCore):
 
         self.assertEqual(source.owner, 'botty-mc-bot-face')
 
+    def test_swm_peer_reviewer_absent(self):
+        data = """
+        '18.04':
+            sources:
+                linux:
+        """
+        ks = KernelSeries(data=data)
+        series = ks.lookup_series('18.04')
+        source = series.lookup_source('linux')
+
+        self.assertIsNone(source.peer_reviewer)
+
+    def test_swm_peer_reviewer_empty(self):
+        data = """
+        '18.04':
+            sources:
+                linux:
+                    peer-reviewer:
+        """
+        ks = KernelSeries(data=data)
+        series = ks.lookup_series('18.04')
+        source = series.lookup_source('linux')
+
+        self.assertIsNone(source.peer_reviewer)
+
+    def test_peer_reviewer_present_something(self):
+        data = """
+        '18.04':
+            sources:
+                linux:
+                    peer-reviewer: botty-mc-bot-face
+        """
+        ks = KernelSeries(data=data)
+        series = ks.lookup_series('18.04')
+        source = series.lookup_source('linux')
+
+        self.assertEqual(source.peer_reviewer, 'botty-mc-bot-face')
 
 class TestKernelSourceTestingFlavourEntry(TestKernelSeriesCore):
 
diff --git a/stable/wfl/bug.py b/stable/wfl/bug.py
index 23b5f5a..557ec4b 100644
--- a/stable/wfl/bug.py
+++ b/stable/wfl/bug.py
@@ -234,6 +234,14 @@ class WorkflowBug():
         return ks
 
     @property
+    def peer_reviewer(self):
+        ks = self.kernel_series
+        ktl_series = ks.lookup_series(codename=self.series)
+        ktl_source = ktl_series.lookup_source(self.name)
+
+        return ktl_source.peer_reviewer
+
+    @property
     def sc(self):
         return ctx.sc
 
diff --git a/stable/wfl/wft/syn_prepare_packages.py b/stable/wfl/wft/syn_prepare_packages.py
index 56fad2d..d626400 100644
--- a/stable/wfl/wft/syn_prepare_packages.py
+++ b/stable/wfl/wft/syn_prepare_packages.py
@@ -83,6 +83,20 @@ class SynPreparePackages(TaskHandler):
             if failures is None:
                 if s.bug.flag('jira-in-review'):
                     s.task.reason = 'Stalled -b Debs waiting for peer-review on SRU board (jira)'
+                    peer_reviewer = s.bug.peer_reviewer
+                    if peer_reviewer is not None:
+                        s.task.bug.announce_drip(
+                            "swm-transition-peer-reviewable",
+                            subject="@{reviewer} [{id}](https://warthogs.atlassian.net/jira/software/c/projects/KSRU/boards/205?selectedIssue={id}) {cycle} {series}:{source} is ready for your review".format(
+                                reviewer=peer_reviewer,
+                                id=s.bug.bprops['issue'],
+                                cycle=s.task.bug.sru_spin_name,
+                                series=s.task.bug.series,
+                                source=s.task.bug.name
+                            ),
+                            every=timedelta(hours=24),
+                            since=s.task.date_confirmed,
+                        )
                 else:
                     s.task.reason = 'Ongoing -b Being cranked by: {}'.format(s.task.assignee.name)
             else: