Skip to content

Pin aproxy version to revision 6 #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
weiiwang01 merged 2 commits into from
Dec 6, 2023
Merged

Pin aproxy version to revision 6 #161

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2857ac9
Pin aproxy revision to revision 6
weiiwang01 Dec 6, 2023
272c997
Fix some linting issue
weiiwang01 Dec 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions src/runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,14 @@
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"
Expand Down Expand Up @@ -511,7 +518,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(
Expand Down Expand Up @@ -855,7 +862,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.
Expand Down