From 2857ac9e05814379245960bf5825b941d93ce24a Mon Sep 17 00:00:00 2001 From: Weii Wang Date: Wed, 6 Dec 2023 11:06:20 +0800 Subject: [PATCH 1/2] Pin aproxy revision to revision 6 --- src/runner.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/runner.py b/src/runner.py index ca9d838e06..16cf08fb78 100644 --- a/src/runner.py +++ b/src/runner.py @@ -51,7 +51,13 @@ LXD_PROFILE_YAML = LXD_PROFILE_YAML.parent / "lxd-profile.yml" LXDBR_DNSMASQ_LEASES_FILE = Path("/var/snap/lxd/common/lxd/networks/lxdbr0/dnsmasq.leases") -Snap = NamedTuple("Snap", [("name", str), ("channel", str)]) + +class Snap(NamedTuple): + """This class represents a snap installation.""" + + name: str + channel: str + revision: Optional[int] = None YQ_BIN_URL_AMD64 = "https://github.com/mikefarah/yq/releases/download/v4.34.1/yq_linux_amd64" YQ_BIN_URL_ARM64 = "https://github.com/mikefarah/yq/releases/download/v4.34.1/yq_linux_arm64" @@ -511,7 +517,7 @@ def _install_binaries(self, runner_binary: Path, arch=ARCH.X64) -> None: self.instance.execute(["/usr/sbin/usermod", "-aG", "microk8s", "ubuntu"]) self._apt_install(["docker.io", "npm", "python3-pip", "shellcheck", "jq", "wget"]) - self._snap_install([Snap(name="aproxy", channel="edge")]) + self._snap_install([Snap(name="aproxy", channel="edge", revision=6)]) self._wget_install( [ WgetExecutable( @@ -855,7 +861,10 @@ def _snap_install(self, snaps: Iterable[Snap]) -> None: for snap in snaps: logger.info("Installing %s via snap...", snap.name) - self.instance.execute(["snap", "install", snap.name, f"--channel={snap.channel}"]) + cmd = ["snap", "install", snap.name, f"--channel={snap.channel}"] + if snap.revision is not None: + cmd.append(f"--revision={snap.revision}") + self.instance.execute(cmd) def _wget_install(self, executables: Iterable[WgetExecutable]) -> None: """Installs the given binaries. From 272c997a60b440da29bbbd048c59de264c809f2f Mon Sep 17 00:00:00 2001 From: Weii Wang Date: Wed, 6 Dec 2023 11:15:06 +0800 Subject: [PATCH 2/2] Fix some linting issue --- src/runner.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/runner.py b/src/runner.py index 16cf08fb78..46bb583b34 100644 --- a/src/runner.py +++ b/src/runner.py @@ -59,6 +59,7 @@ class Snap(NamedTuple): channel: str revision: Optional[int] = None + YQ_BIN_URL_AMD64 = "https://github.com/mikefarah/yq/releases/download/v4.34.1/yq_linux_amd64" YQ_BIN_URL_ARM64 = "https://github.com/mikefarah/yq/releases/download/v4.34.1/yq_linux_arm64"