azure: Deal with repository changes

The preview repositories are now a layer on top of the prod repositories,
so let's adapt mkosi to that.

diff --git a/mkosi.conf.d/20-azure.conf b/mkosi.conf.d/20-azure.conf
index 6dc333a569c80a439df563dd06d85af4f51d24b5..6283a7d694fc29b95b444622a33475f1a6b26d2a 100644 (file)
--- a/mkosi.conf.d/20-azure.conf
+++ b/mkosi.conf.d/20-azure.conf
@@ -4,7 +4,8 @@
 Distribution=azure
 
 [Distribution]
-Release=3.0-preview
+Release=3.0
+Repositories=base-preview
 
 [Content]
 # The unsigned-shim package tries to install to the same location as the signed shim package so we can't install and

diff --git a/mkosi/distributions/azure.py b/mkosi/distributions/azure.py
index 17f172caba483c33f63e574550c92f2f9e2a211a..83e8d2bb0ca4b45d0fa7466750931f238aa03042 100644 (file)
--- a/mkosi/distributions/azure.py
+++ b/mkosi/distributions/azure.py
@@ -21,7 +21,7 @@ class Installer(fedora.Installer):
 
     @classmethod
     def default_release(cls) -> str:
-        return "3.0-prod"
+        return "3.0"
 
     @classmethod
     def filesystem(cls) -> str:
@@ -52,26 +52,33 @@ class Installer(fedora.Installer):
             return
 
         mirror = context.config.mirror or "https://packages.microsoft.com/azurelinux"
+        url = join_mirror(mirror, context.config.release)
 
-        if any(context.config.release.endswith(f"-{suffix}") for suffix in ("prod", "preview")):
-            rel = context.config.release
-        else:
-            rel = f"{context.config.release}-prod"
-
-        url = join_mirror(mirror, rel.replace("-", "/"))
-
-        nvidia = "nvidia" if rel.endswith("-prod") else "NVIDIA"
-        for repo in ("base", "extended", "ms-oss", "ms-non-oss", "cloud-native", nvidia):
+        for repo in ("base", "extended", "ms-oss", "ms-non-oss", "cloud-native", "nvidia"):
             yield RpmRepository(
                 repo,
-                f"baseurl={url}/{repo}/$basearch",
+                f"baseurl={url}/prod/{repo}/$basearch",
+                gpgurls,
+            )
+
+            repo = "NVIDIA" if repo == "nvidia" else repo
+            yield RpmRepository(
+                f"{repo}-preview",
+                f"baseurl={url}/preview/{repo}/$basearch",
                 gpgurls,
+                enabled=False,
             )
 
         for repo in ("base", "cloud-native", "extended"):
             yield RpmRepository(
                 f"{repo}-debuginfo",
-                f"baseurl={url}/{repo}/debuginfo/$basearch",
+                f"baseurl={url}/prod/{repo}/debuginfo/$basearch",
+                gpgurls,
+                enabled=False,
+            )
+            yield RpmRepository(
+                f"{repo}-preview-debuginfo",
+                f"baseurl={url}/preview/{repo}/debuginfo/$basearch",
                 gpgurls,
                 enabled=False,
             )
@@ -79,7 +86,13 @@ class Installer(fedora.Installer):
         for repo in ("base", "cloud-native", "extended", "ms-oss"):
             yield RpmRepository(
                 f"{repo}-source",
-                f"baseurl={url}/{repo}/srpms",
+                f"baseurl={url}/prod/{repo}/srpms",
+                gpgurls,
+                enabled=False,
+            )
+            yield RpmRepository(
+                f"{repo}-source",
+                f"baseurl={url}/preview/{repo}/srpms",
                 gpgurls,
                 enabled=False,
             )