Merge ~xnox/launchpad:snap-request-builds-mimick-auto into launchpad:master

[Dimitri John Ledkov]

snappy: Make requestbuild use auto-build archive and pocket defaults

Make request snap builds page for a snap, reuse auto-build archive & pocket, if set on the snap.

Rationale:
* Currently many snap builds are only correct, or successful if they use a predetermined set of snap recipe configuration. For example - beta channel recipe, uses beta PPA archive to pull in relevant beta .deb dependencies. Or for example use special forked dependencies from a given private archive (for pre-release or edge builds). Especially when such archives cannot be encoded in the snapcraft.yaml (as they are either private, or need to be dynamically updated to one of multiple valid options, depending on upload target).
* Auto-builds are able to correctly set desired auto-build archive, and it is correctly used
* When triggering a manual build, currently the default auto-build settings are not used. Meaning one has to carefully inspect snap recipe auto-build settings and lookup matching build archive and set it on the request snap build page to ensure the manual triggered build is done the same way as the automatically triggered one
* Fix this UI/UX issue by pre-populating manually triggered build, with the same defaults that automaticly triggered builds use. Such that for example the same build archive is used.

QAStaging test case:
* Create snap recipe
* Set it to autobuild
* Set a PPA archive for autobuilds
* Click Requests Builds
* The UI page of requests builds should have the same autobuild PPA prepulated and selected

LP: #2028687

[Dimitri John Ledkov (xnox)]

ping

[Colin Watson (cjwatson)]

I'm not sure it necessarily makes sense for us to look at this before you write some tests. I think I'm OK with the approach in principle.

[Dimitri John Ledkov (xnox)]

Under class TestSnapRequestBuildsView(BaseTestSnapView) I don't see any test cases that test any of the SnapRequestBuildsView.initial_values()

I think i can force some changes to snap recipe under test, and then force for test_request_builds_page() text output to match what i need.

[Dimitri John Ledkov (xnox)]

Managed to add test cases, and rerun all tests under lp.snappy.browser
Reverting code change, makes the test cases fail (default to archive & updates, instead of the auto_build_archive & auto_build_pocket)

[Dimitri John Ledkov (xnox)]

Call out duplicate login, in the browser test.

[Dimitri John Ledkov (xnox)]

Updated rationale and qastaging test case

Unmerged commits

49f5a4b... by Dimitri John Ledkov on 2023-11-22

snappy: Make requestbuild use auto-build archive and pocket defaults

Make request snap builds page for a snap, reuse auto-build archive &
pocket, if set on the snap.

Proof of concept untested code, no tests added.

LP: #2028687

	docs:0 (build)
	lint:0 (build)
	mypy:0 (build)

1 → 3 of 3 results

First • Previous • Next • Last

diff --git a/lib/lp/snappy/browser/snap.py b/lib/lp/snappy/browser/snap.py
index b783dcd..96b7656 100644
--- a/lib/lp/snappy/browser/snap.py
+++ b/lib/lp/snappy/browser/snap.py
@@ -474,7 +474,8 @@ class SnapRequestBuildsView(LaunchpadFormView):
     def initial_values(self):
         """See `LaunchpadFormView`."""
         return {
-            "archive": (
+            "archive": self.context.auto_build_archive
+            or (
                 # XXX cjwatson 2019-02-04: In order to support non-Ubuntu
                 # bases, we'd need to store this as None and infer it based
                 # on the inferred distro series; but this will do for now.
@@ -483,7 +484,8 @@ class SnapRequestBuildsView(LaunchpadFormView):
                 else self.context.distro_series.main_archive
             ),
             "distro_arch_series": [],
-            "pocket": PackagePublishingPocket.UPDATES,
+            "pocket": self.context.auto_build_pocket
+            or PackagePublishingPocket.UPDATES,
             "channels": self.context.auto_build_channels,
         }
 
diff --git a/lib/lp/snappy/browser/tests/test_snap.py b/lib/lp/snappy/browser/tests/test_snap.py
index 2de0693..3b11e7c 100644
--- a/lib/lp/snappy/browser/tests/test_snap.py
+++ b/lib/lp/snappy/browser/tests/test_snap.py
@@ -2800,6 +2800,45 @@ class TestSnapRequestBuildsView(BaseTestSnapView):
             ),
         )
 
+    def test_request_builds_with_autobuild_archive(self):
+        # Ensure that auto_build_archive is used as default for builds
+        ppa = self.factory.makeArchive(
+            distribution=self.ubuntu, owner=self.person, name="snap-ppa"
+        )
+        login_person(self.person)
+        self.snap.auto_build_archive = ppa
+        browser = self.getViewBrowser(
+            self.snap, "+request-builds", user=self.person
+        )
+        browser.getControl("Request builds").click()
+
+        login_person(self.person)
+        [request] = self.snap.pending_build_requests
+        self.assertThat(
+            request,
+            MatchesStructure(
+                archive=Equals(ppa),
+            ),
+        )
+
+    def test_request_builds_with_autobuild_pocket(self):
+        # Ensure that auto_build_pocket is used as default for builds
+        login_person(self.person)
+        self.snap.auto_build_pocket = PackagePublishingPocket.SECURITY
+        browser = self.getViewBrowser(
+            self.snap, "+request-builds", user=self.person
+        )
+        browser.getControl("Request builds").click()
+
+        login_person(self.person)
+        [request] = self.snap.pending_build_requests
+        self.assertThat(
+            request,
+            MatchesStructure(
+                pocket=Equals(PackagePublishingPocket.SECURITY),
+            ),
+        )
+
     def test_request_builds_no_architectures_action(self):
         # Requesting a build with no architectures selected creates a
         # pending build request.