From c9b019c017e17342f5b78911460876835b38f31d Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 12 May 2025 22:26:06 +0200 Subject: [PATCH 1/2] profile --- incus.py | 59 +++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 50 insertions(+), 9 deletions(-) diff --git a/incus.py b/incus.py index 127b7de..4fa45cf 100755 --- a/incus.py +++ b/incus.py @@ -14,19 +14,60 @@ META = f"{ROOT}/meta" STREAMS = f"{META}/simplestreams/v1" -WANTED = { - "architectures": [ - "amd64", - "arm64", - ], - "images": { - "debian", - "arm64", +TYPE = ( + "default", +) +TYPES = ( + "default", + "cloud", +) +ARCHITECTURES_TYPE = { + "amd64": TYPE, + "arm64": TYPE, +} +ARCHITECTURES_TYPES = { + "amd64": TYPES, + "arm64": TYPES, +} +EL = { + "9": ARCHITECTURES_TYPES, + "8": ARCHITECTURES_TYPES, +} +PROFILE = { + "almalinux": EL, + "alpine": { + "3.21": ARCHITECTURES_TYPES, + "3.20": ARCHITECTURES_TYPES, + }, + "archlinux": { + "current": { + "amd64": TYPES, + "arm64": TYPES, + }, + }, + "debian": { + "bookworm": ARCHITECTURES_TYPES, + "bullseye": ARCHITECTURES_TYPES, + }, + "fedora": { + "42": ARCHITECTURES_TYPES, + "41": ARCHITECTURES_TYPES, + }, + "nixos": { + "24.11": ARCHITECTURES_TYPE, + }, + "opensuse": { + "15.6": ARCHITECTURES_TYPES, + "15.5": ARCHITECTURES_TYPE, + }, + "rockylinux": EL, + "ubuntu": { + "noble": ARCHITECTURES_TYPES, + "jammy": ARCHITECTURES_TYPES, }, } - def main() -> None: root = Path(__file__).resolve().parent / "root" # root path From 23b3fce7cb77645d8eb9d0af1ede2f314adc11a1 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 12 May 2025 22:39:12 +0200 Subject: [PATCH 2/2] functions --- incus.py | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/incus.py b/incus.py index 4fa45cf..5793d09 100755 --- a/incus.py +++ b/incus.py @@ -33,37 +33,37 @@ EL = { "9": ARCHITECTURES_TYPES, "8": ARCHITECTURES_TYPES, } + + +def architectures_type(*versions: str) -> dict: + return {version: ARCHITECTURES_TYPE for version in versions} + + +def architectures_types(*versions: str) -> dict: + return {version: ARCHITECTURES_TYPES for version in versions} + + PROFILE = { + "nixos": architectures_type("24.11"), + # apk + "alpine": architectures_types("3.21", "3.20"), + # deb + "debian": architectures_types("bookworm", "bullseye"), + "ubuntu": architectures_types("noble", "jammy"), + # rpm "almalinux": EL, - "alpine": { - "3.21": ARCHITECTURES_TYPES, - "3.20": ARCHITECTURES_TYPES, - }, - "archlinux": { - "current": { - "amd64": TYPES, - "arm64": TYPES, - }, - }, - "debian": { - "bookworm": ARCHITECTURES_TYPES, - "bullseye": ARCHITECTURES_TYPES, - }, - "fedora": { - "42": ARCHITECTURES_TYPES, - "41": ARCHITECTURES_TYPES, - }, - "nixos": { - "24.11": ARCHITECTURES_TYPE, - }, + "fedora": architectures_types("42", "41"), "opensuse": { "15.6": ARCHITECTURES_TYPES, "15.5": ARCHITECTURES_TYPE, }, "rockylinux": EL, - "ubuntu": { - "noble": ARCHITECTURES_TYPES, - "jammy": ARCHITECTURES_TYPES, + # rolling + "archlinux": { + "current": { + "amd64": TYPES, + "arm64": TYPE, + }, }, }