Merge pull request #3600 from snapcore/remote-build

remote build: use channel defaults (CRAFT-568)
canonical · Nov 26, 2021 · 6382398 · 6382398
2 parents e744669 + c095b34
commit 6382398
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/snapcraft/internal/remote_build/_launchpad.py b/snapcraft/internal/remote_build/_launchpad.py
@@ -187,14 +187,7 @@ def _get_snap(self) -> Optional[Entry]:
     def _issue_build_request(self, snap: Entry) -> Entry:
         dist = self._lp.distributions["ubuntu"]
         archive = dist.main_archive
-        return snap.requestBuilds(
-            archive=archive,
-            channels={
-                "core18": self._core18_channel,
-                "snapcraft": self._snapcraft_channel,
-            },
-            pocket="Updates",
-        )
+        return snap.requestBuilds(archive=archive, pocket="Updates",)
 
     def _lp_load_url(self, url: str) -> Entry:
         """Load Launchpad url with a retry in case the connection is lost."""

diff --git a/tests/unit/remote_build/test_launchpad.py b/tests/unit/remote_build/test_launchpad.py
@@ -318,13 +318,7 @@ def test_issue_build_request_defaults(self):
         self.assertThat(
             fake_snap.mock_calls,
             Equals(
-                [
-                    mock.call.requestBuilds(
-                        archive="main_archive",
-                        channels={"core18": "stable", "snapcraft": "stable"},
-                        pocket="Updates",
-                    )
-                ]
+                [mock.call.requestBuilds(archive="main_archive", pocket="Updates",)]
             ),
         )