launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #33030
[Merge] ~artemstreltsov/launchpad-buildd:revert_snap_refresh_snapd into launchpad-buildd:master
Artem Streltsov has proposed merging ~artemstreltsov/launchpad-buildd:revert_snap_refresh_snapd into launchpad-buildd:master.
Commit message:
Revert snap_refresh_snapd
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~artemstreltsov/launchpad-buildd/+git/launchpad-buildd/+merge/493364
--
Your team Launchpad code reviewers is requested to review the proposed merge of ~artemstreltsov/launchpad-buildd:revert_snap_refresh_snapd into launchpad-buildd:master.
diff --git a/debian/changelog b/debian/changelog
index 02dcd3a..240b85d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,3 @@
-launchpad-buildd (258) noble; urgency=medium
-
- [ Artem Streltsov ]
- * Unpin docker.io PPA.
- * Add docker v26 support.
- * Remove snap install hello.
- * Add snap refresh snapd when not using fetch service.
-
- -- Artem Streltsov <artem.streltsov@xxxxxxxxxxxxx> Fri, 19 Sep 2025 15:11:22 +0100
-
launchpad-buildd (257) noble; urgency=medium
[ Simone Pelosi ]
diff --git a/lpbuildd/target/build_charm.py b/lpbuildd/target/build_charm.py
index 72541b1..223977f 100644
--- a/lpbuildd/target/build_charm.py
+++ b/lpbuildd/target/build_charm.py
@@ -85,7 +85,6 @@ class BuildCharm(
self.backend.run(["apt-get", "-y", "install"] + deps)
if self.backend.supports_snapd:
self.snap_store_set_proxy()
- self.snap_refresh_snapd()
for snap_name, channel in sorted(self.args.channels.items()):
# charmcraft is handled separately, since it requires --classic.
if snap_name != "charmcraft":
diff --git a/lpbuildd/target/build_craft.py b/lpbuildd/target/build_craft.py
index 25d5d1b..4d727e5 100644
--- a/lpbuildd/target/build_craft.py
+++ b/lpbuildd/target/build_craft.py
@@ -111,7 +111,6 @@ class BuildCraft(
self.backend.run(["apt-get", "-y", "install"] + deps)
if self.backend.supports_snapd:
self.snap_store_set_proxy()
- self.snap_refresh_snapd()
for snap_name, channel in sorted(self.args.channels.items()):
# sourcecraft is handled separately, since it requires --classic,
# which disables all sandboxing to ensure it runs with no strict
diff --git a/lpbuildd/target/build_livefs.py b/lpbuildd/target/build_livefs.py
index 1976940..775d4ba 100644
--- a/lpbuildd/target/build_livefs.py
+++ b/lpbuildd/target/build_livefs.py
@@ -127,7 +127,6 @@ class BuildLiveFS(SnapStoreOperationMixin, Operation):
self.backend.run(["apt-get", "-y", "install"] + deps)
if self.backend.supports_snapd:
self.snap_store_set_proxy()
- self.snap_refresh_snapd()
if self.args.locale is not None:
self.backend.run(
[
diff --git a/lpbuildd/target/build_oci.py b/lpbuildd/target/build_oci.py
index 7a5424f..28c4869 100644
--- a/lpbuildd/target/build_oci.py
+++ b/lpbuildd/target/build_oci.py
@@ -82,7 +82,6 @@ class BuildOCI(
self.backend.run(["apt-get", "-y", "install", "docker.io"])
if self.backend.supports_snapd:
self.snap_store_set_proxy()
- self.snap_refresh_snapd()
self.backend.run(["systemctl", "restart", "docker"])
# The docker snap can't see /build, so we have to do our work under
# /home/buildd instead. Make sure it exists.
diff --git a/lpbuildd/target/build_rock.py b/lpbuildd/target/build_rock.py
index c0e8ce6..1d8e9fd 100644
--- a/lpbuildd/target/build_rock.py
+++ b/lpbuildd/target/build_rock.py
@@ -92,7 +92,6 @@ class BuildRock(
self.backend.run(["apt-get", "-y", "install"] + deps)
if self.backend.supports_snapd:
self.snap_store_set_proxy()
- self.snap_refresh_snapd()
for snap_name, channel in sorted(self.args.channels.items()):
# rockcraft is handled separately, since it requires --classic,
# which disables all sandboxing to ensure it runs with no strict
diff --git a/lpbuildd/target/build_snap.py b/lpbuildd/target/build_snap.py
index 9ee7014..5d957ae 100644
--- a/lpbuildd/target/build_snap.py
+++ b/lpbuildd/target/build_snap.py
@@ -150,7 +150,6 @@ class BuildSnap(
self.backend.run(["apt-get", "-y", "install"] + deps)
if self.backend.supports_snapd:
self.snap_store_set_proxy()
- self.snap_refresh_snapd()
for snap_name, channel in sorted(self.args.channels.items()):
# snapcraft is handled separately, since it requires --classic.
if snap_name != "snapcraft":
diff --git a/lpbuildd/target/run_ci.py b/lpbuildd/target/run_ci.py
index f626078..54aca19 100644
--- a/lpbuildd/target/run_ci.py
+++ b/lpbuildd/target/run_ci.py
@@ -65,7 +65,6 @@ class RunCIPrepare(
self.backend.run(["apt-get", "-y", "install"] + deps)
if self.backend.supports_snapd:
self.snap_store_set_proxy()
- self.snap_refresh_snapd()
for snap_name, channel in sorted(self.args.channels.items()):
if snap_name not in ("lxd", "lpci"):
self.backend.run(
diff --git a/lpbuildd/target/snapstore.py b/lpbuildd/target/snapstore.py
index 94637d2..348e6d5 100644
--- a/lpbuildd/target/snapstore.py
+++ b/lpbuildd/target/snapstore.py
@@ -1,14 +1,10 @@
# Copyright 2019 Canonical Ltd. This software is licensed under the
# GNU Affero General Public License version 3 (see the file LICENSE).
-import logging
-import subprocess
from urllib.parse import urljoin, urlparse, urlunparse
import requests
-logger = logging.getLogger(__name__)
-
class SnapStoreOperationMixin:
"""Methods supporting operations that interact with the snap store."""
@@ -43,11 +39,3 @@ class SnapStoreOperationMixin:
self.backend.run(
["snap", "set", "core", f"proxy.store={store_id}"]
)
-
- def snap_refresh_snapd(self):
- if getattr(self.args, "use_fetch_service", False):
- return
- try:
- self.backend.run(["snap", "refresh", "snapd"])
- except subprocess.CalledProcessError as e:
- logger.info(f"Error running snap refresh snapd: {e}")
diff --git a/lpbuildd/target/tests/test_build_charm.py b/lpbuildd/target/tests/test_build_charm.py
index e804a11..c9f11c3 100644
--- a/lpbuildd/target/tests/test_build_charm.py
+++ b/lpbuildd/target/tests/test_build_charm.py
@@ -107,7 +107,6 @@ class TestBuildCharm(TestCase):
RanAptGet(
"install", "bzr", "python3-pip", "python3-setuptools"
),
- RanSnap("refresh", "snapd"),
RanSnap("install", "--channel=candidate", "core"),
RanSnap("install", "--channel=beta", "core18"),
RanSnap(
@@ -139,7 +138,6 @@ class TestBuildCharm(TestCase):
RanAptGet(
"install", "bzr", "python3-pip", "python3-setuptools"
),
- RanSnap("refresh", "snapd"),
RanSnap("install", "--classic", "charmcraft"),
RanCommand(["mkdir", "-p", "/home/buildd"]),
]
@@ -167,7 +165,6 @@ class TestBuildCharm(TestCase):
RanAptGet(
"install", "git", "python3-pip", "python3-setuptools"
),
- RanSnap("refresh", "snapd"),
RanSnap("install", "--classic", "charmcraft"),
RanCommand(["mkdir", "-p", "/home/buildd"]),
]
@@ -223,7 +220,6 @@ class TestBuildCharm(TestCase):
RanCommand(
["snap", "set", "core", "proxy.store=store-id"]
),
- RanSnap("refresh", "snapd"),
RanSnap("install", "--classic", "charmcraft"),
RanCommand(["mkdir", "-p", "/home/buildd"]),
]
@@ -264,7 +260,6 @@ class TestBuildCharm(TestCase):
"python3-pip",
"python3-setuptools",
),
- RanSnap("refresh", "snapd"),
RanSnap("install", "--classic", "charmcraft"),
RanCommand(["mkdir", "-p", "/home/buildd"]),
]
diff --git a/lpbuildd/target/tests/test_build_craft.py b/lpbuildd/target/tests/test_build_craft.py
index 465c0ae..3205ce5 100644
--- a/lpbuildd/target/tests/test_build_craft.py
+++ b/lpbuildd/target/tests/test_build_craft.py
@@ -103,7 +103,6 @@ class TestBuildCraft(TestCase):
MatchesListwise(
[
RanAptGet("install", "bzr"),
- RanSnap("refresh", "snapd"),
RanSnap("install", "--channel=candidate", "core"),
RanSnap("install", "--channel=beta", "core18"),
RanSnap(
@@ -133,7 +132,6 @@ class TestBuildCraft(TestCase):
MatchesListwise(
[
RanAptGet("install", "bzr"),
- RanSnap("refresh", "snapd"),
RanSnap(
"install",
"--classic",
@@ -164,7 +162,6 @@ class TestBuildCraft(TestCase):
MatchesListwise(
[
RanAptGet("install", "git"),
- RanSnap("refresh", "snapd"),
RanSnap(
"install",
"--classic",
@@ -223,7 +220,6 @@ class TestBuildCraft(TestCase):
RanCommand(
["snap", "set", "core", "proxy.store=store-id"]
),
- RanSnap("refresh", "snapd"),
RanSnap(
"install",
"--classic",
@@ -267,7 +263,6 @@ class TestBuildCraft(TestCase):
"socat",
"git",
),
- RanSnap("refresh", "snapd"),
RanSnap(
"install",
"--classic",
@@ -1459,7 +1454,6 @@ class TestBuildCraft(TestCase):
MatchesListwise(
[
RanAptGet("install", "git", "clamav"),
- RanSnap("refresh", "snapd"),
RanSnap(
"install",
"--classic",
@@ -1514,7 +1508,6 @@ class TestBuildCraft(TestCase):
"git",
"clamav",
),
- RanSnap("refresh", "snapd"),
RanSnap(
"install",
"--classic",
@@ -1558,7 +1551,6 @@ class TestBuildCraft(TestCase):
MatchesListwise(
[
RanAptGet("install", "git", "clamav"),
- RanSnap("refresh", "snapd"),
RanSnap(
"install",
"--classic",
diff --git a/lpbuildd/target/tests/test_build_livefs.py b/lpbuildd/target/tests/test_build_livefs.py
index f4d8815..21633ab 100644
--- a/lpbuildd/target/tests/test_build_livefs.py
+++ b/lpbuildd/target/tests/test_build_livefs.py
@@ -18,7 +18,6 @@ from lpbuildd.target.tests.matchers import (
RanAptGet,
RanBuildCommand,
RanCommand,
- RanSnap,
)
from lpbuildd.tests.fakebuilder import FakeMethod
@@ -38,10 +37,7 @@ class TestBuildLiveFS(TestCase):
self.assertThat(
build_livefs.backend.run.calls,
MatchesListwise(
- [
- RanAptGet("install", "livecd-rootfs"),
- RanSnap("refresh", "snapd"),
- ],
+ [RanAptGet("install", "livecd-rootfs")],
),
)
@@ -62,7 +58,6 @@ class TestBuildLiveFS(TestCase):
MatchesListwise(
[
RanAptGet("install", "livecd-rootfs"),
- RanSnap("refresh", "snapd"),
RanAptGet(
"--install-recommends",
"install",
@@ -116,7 +111,6 @@ class TestBuildLiveFS(TestCase):
RanCommand(
["snap", "set", "core", "proxy.store=store-id"]
),
- RanSnap("refresh", "snapd"),
]
),
)
diff --git a/lpbuildd/target/tests/test_build_oci.py b/lpbuildd/target/tests/test_build_oci.py
index 10fc87c..46a3343 100644
--- a/lpbuildd/target/tests/test_build_oci.py
+++ b/lpbuildd/target/tests/test_build_oci.py
@@ -22,7 +22,6 @@ from lpbuildd.target.tests.matchers import (
RanAptGet,
RanBuildCommand,
RanCommand,
- RanSnap,
)
from lpbuildd.tests.fakebuilder import FakeMethod
@@ -102,7 +101,6 @@ class TestBuildOCI(TestCase):
[
RanAptGet("install", "bzr"),
RanAptGet("install", "docker.io"),
- RanSnap("refresh", "snapd"),
RanCommand(["systemctl", "restart", "docker"]),
RanCommand(["mkdir", "-p", "/home/buildd"]),
]
@@ -129,7 +127,6 @@ class TestBuildOCI(TestCase):
[
RanAptGet("install", "git"),
RanAptGet("install", "docker.io"),
- RanSnap("refresh", "snapd"),
RanCommand(["systemctl", "restart", "docker"]),
RanCommand(["mkdir", "-p", "/home/buildd"]),
]
@@ -183,7 +180,6 @@ class TestBuildOCI(TestCase):
RanCommand(
["snap", "set", "core", "proxy.store=store-id"]
),
- RanSnap("refresh", "snapd"),
]
),
)
@@ -219,7 +215,6 @@ class TestBuildOCI(TestCase):
),
RanAptGet("install", "python3", "socat", "git"),
RanAptGet("install", "docker.io"),
- RanSnap("refresh", "snapd"),
RanCommand(["systemctl", "restart", "docker"]),
RanCommand(["mkdir", "-p", "/home/buildd"]),
]
diff --git a/lpbuildd/target/tests/test_build_rock.py b/lpbuildd/target/tests/test_build_rock.py
index 339ff53..5fa2b1b 100644
--- a/lpbuildd/target/tests/test_build_rock.py
+++ b/lpbuildd/target/tests/test_build_rock.py
@@ -108,7 +108,6 @@ class TestBuildRock(TestCase):
"python3-setuptools",
"dirmngr",
),
- RanSnap("refresh", "snapd"),
RanSnap("install", "--channel=candidate", "core"),
RanSnap("install", "--channel=beta", "core18"),
RanSnap(
@@ -144,7 +143,6 @@ class TestBuildRock(TestCase):
"python3-setuptools",
"dirmngr",
),
- RanSnap("refresh", "snapd"),
RanSnap("install", "--classic", "rockcraft"),
RanCommand(["mkdir", "-p", "/home/buildd"]),
]
@@ -176,7 +174,6 @@ class TestBuildRock(TestCase):
"python3-setuptools",
"dirmngr",
),
- RanSnap("refresh", "snapd"),
RanSnap("install", "--classic", "rockcraft"),
RanCommand(["mkdir", "-p", "/home/buildd"]),
]
@@ -236,7 +233,6 @@ class TestBuildRock(TestCase):
RanCommand(
["snap", "set", "core", "proxy.store=store-id"]
),
- RanSnap("refresh", "snapd"),
RanSnap("install", "--classic", "rockcraft"),
RanCommand(["mkdir", "-p", "/home/buildd"]),
]
@@ -278,7 +274,6 @@ class TestBuildRock(TestCase):
"python3-setuptools",
"dirmngr",
),
- RanSnap("refresh", "snapd"),
RanSnap("install", "--classic", "rockcraft"),
RanCommand(["mkdir", "-p", "/home/buildd"]),
]
diff --git a/lpbuildd/target/tests/test_build_snap.py b/lpbuildd/target/tests/test_build_snap.py
index aa8c4e8..3a94727 100644
--- a/lpbuildd/target/tests/test_build_snap.py
+++ b/lpbuildd/target/tests/test_build_snap.py
@@ -73,7 +73,6 @@ class TestBuildSnap(TestCase):
MatchesListwise(
[
RanAptGet("install", "bzr", "snapcraft"),
- RanSnap("refresh", "snapd"),
]
),
)
@@ -97,7 +96,6 @@ class TestBuildSnap(TestCase):
MatchesListwise(
[
RanAptGet("install", "git", "snapcraft"),
- RanSnap("refresh", "snapd"),
]
),
)
@@ -149,7 +147,6 @@ class TestBuildSnap(TestCase):
RanCommand(
["snap", "set", "core", "proxy.store=store-id"]
),
- RanSnap("refresh", "snapd"),
]
),
)
@@ -183,7 +180,6 @@ class TestBuildSnap(TestCase):
RanAptGet(
"install", "python3", "socat", "git", "snapcraft"
),
- RanSnap("refresh", "snapd"),
RanCommand(["mkdir", "-p", "/root/.subversion"]),
]
),
@@ -414,7 +410,6 @@ class TestBuildSnap(TestCase):
MatchesListwise(
[
RanAptGet("install", "bzr", "sudo"),
- RanSnap("refresh", "snapd"),
RanSnap("install", "--channel=candidate", "core"),
RanSnap("refresh", "--channel=candidate", "core"),
RanSnap("install", "--channel=beta", "core18"),
diff --git a/lpbuildd/target/tests/test_run_ci.py b/lpbuildd/target/tests/test_run_ci.py
index 2978565..8ea5eef 100644
--- a/lpbuildd/target/tests/test_run_ci.py
+++ b/lpbuildd/target/tests/test_run_ci.py
@@ -57,7 +57,6 @@ class TestRunCIPrepare(TestCase):
MatchesListwise(
[
RanAptGet("install", "git"),
- RanSnap("refresh", "snapd"),
RanSnap("install", "lxd"),
RanSnap("install", "--classic", "lpci"),
RanCommand(["lxd", "init", "--auto"]),
@@ -106,7 +105,6 @@ class TestRunCIPrepare(TestCase):
RanAptGet("install", "git"),
RanSnap("ack", "/dev/stdin", input_text=store_assertion),
RanSnap("set", "core", "proxy.store=store-id"),
- RanSnap("refresh", "snapd"),
RanSnap("install", "lxd"),
RanSnap("install", "--classic", "lpci"),
RanCommand(["lxd", "init", "--auto"]),
@@ -140,7 +138,6 @@ class TestRunCIPrepare(TestCase):
MatchesListwise(
[
RanAptGet("install", "python3", "socat", "git"),
- RanSnap("refresh", "snapd"),
RanSnap("install", "lxd"),
RanSnap("install", "--classic", "lpci"),
RanCommand(["lxd", "init", "--auto"]),
@@ -176,7 +173,6 @@ class TestRunCIPrepare(TestCase):
MatchesListwise(
[
RanAptGet("install", "git"),
- RanSnap("refresh", "snapd"),
RanSnap("install", "--channel=candidate", "core"),
RanSnap("install", "--channel=beta", "core20"),
RanSnap("install", "--channel=beta", "lxd"),
@@ -205,7 +201,6 @@ class TestRunCIPrepare(TestCase):
MatchesListwise(
[
RanAptGet("install", "git", "clamav"),
- RanSnap("refresh", "snapd"),
RanSnap("install", "lxd"),
RanSnap("install", "--classic", "lpci"),
RanCommand(["lxd", "init", "--auto"]),
@@ -249,7 +244,6 @@ class TestRunCIPrepare(TestCase):
MatchesListwise(
[
RanAptGet("install", "python3", "socat", "git", "clamav"),
- RanSnap("refresh", "snapd"),
RanSnap("install", "lxd"),
RanSnap("install", "--classic", "lpci"),
RanCommand(["lxd", "init", "--auto"]),
@@ -282,7 +276,6 @@ class TestRunCIPrepare(TestCase):
MatchesListwise(
[
RanAptGet("install", "git", "clamav"),
- RanSnap("refresh", "snapd"),
RanSnap("install", "lxd"),
RanSnap("install", "--classic", "lpci"),
RanCommand(["lxd", "init", "--auto"]),
Follow ups
