example/centos: use architecture in repos

Repositories only differed by including the architecture in their URL. Let's unify them. Signed-off-by: Simon de Vlieger <[email protected]>
osbuild · Oct 3, 2024 · 451e6d1 · 451e6d1
1 parent 8401f1a
commit 451e6d1
Show file tree

Hide file tree

Showing 24 changed files with 44 additions and 58 deletions.
diff --git a/example/centos/centos-9-aarch64-ami.yaml b/example/centos/centos-9-aarch64-ami.yaml
@@ -15,7 +15,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - coreutils
@@ -37,7 +37,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             # https://github.com/osbuild/images/blob/v0.86.0/pkg/distro/rhel/rhel9/ami.go#L189

diff --git a/example/centos/centos-9-aarch64-edge-commit.yaml b/example/centos/centos-9-aarch64-edge-commit.yaml
@@ -15,7 +15,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - coreutils
@@ -36,7 +36,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - NetworkManager

diff --git a/example/centos/centos-9-aarch64-image-installer.yaml b/example/centos/centos-9-aarch64-image-installer.yaml
@@ -20,7 +20,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - coreutils
@@ -51,7 +51,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - "@core"
@@ -117,7 +117,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - aajohan-comfortaa-fonts

diff --git a/example/centos/centos-9-aarch64-minimal-raw.yaml b/example/centos/centos-9-aarch64-minimal-raw.yaml
@@ -15,7 +15,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - coreutils
@@ -36,7 +36,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - "@core"

diff --git a/example/centos/centos-9-aarch64-qcow2.yaml b/example/centos/centos-9-aarch64-qcow2.yaml
@@ -15,7 +15,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - coreutils
@@ -37,7 +37,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - "@core"

diff --git a/example/centos/centos-9-aarch64-tar.yaml b/example/centos/centos-9-aarch64-tar.yaml
@@ -14,7 +14,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - coreutils
@@ -34,7 +34,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - selinux-policy-targeted

diff --git a/example/centos/centos-9-aarch64-vhd.yaml b/example/centos/centos-9-aarch64-vhd.yaml
@@ -15,7 +15,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - coreutils
@@ -38,7 +38,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - "@Server"

diff --git a/example/centos/centos-9-aarch64-wsl.yaml b/example/centos/centos-9-aarch64-wsl.yaml
@@ -9,7 +9,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - coreutils
@@ -29,7 +29,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - alternatives

diff --git a/example/centos/centos-9-ppc64le-tar.yaml b/example/centos/centos-9-ppc64le-tar.yaml
@@ -14,7 +14,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - coreutils
@@ -34,7 +34,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - selinux-policy-targeted

diff --git a/example/centos/centos-9-s390x-tar.yaml b/example/centos/centos-9-s390x-tar.yaml
@@ -14,7 +14,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - coreutils
@@ -34,7 +34,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - selinux-policy-targeted

diff --git a/example/centos/centos-9-x86_64-ami.yaml b/example/centos/centos-9-x86_64-ami.yaml
@@ -15,7 +15,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - coreutils
@@ -38,7 +38,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             # https://github.com/osbuild/images/blob/v0.86.0/pkg/distro/rhel/rhel9/ami.go#L189

diff --git a/example/centos/centos-9-x86_64-edge-commit.yaml b/example/centos/centos-9-x86_64-edge-commit.yaml
@@ -15,7 +15,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - coreutils
@@ -37,7 +37,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - NetworkManager

diff --git a/example/centos/centos-9-x86_64-image-installer.yaml b/example/centos/centos-9-x86_64-image-installer.yaml
@@ -20,7 +20,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - coreutils
@@ -55,7 +55,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - "@core"
@@ -123,7 +123,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - aajohan-comfortaa-fonts

diff --git a/example/centos/centos-9-x86_64-minimal-raw.yaml b/example/centos/centos-9-x86_64-minimal-raw.yaml
@@ -15,7 +15,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - coreutils
@@ -36,7 +36,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - "@core"

diff --git a/example/centos/centos-9-x86_64-ova.yaml b/example/centos/centos-9-x86_64-ova.yaml
@@ -15,7 +15,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - coreutils
@@ -39,7 +39,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - "@core"

diff --git a/example/centos/centos-9-x86_64-qcow2.yaml b/example/centos/centos-9-x86_64-qcow2.yaml
@@ -15,7 +15,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - coreutils
@@ -38,7 +38,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - "@core"

diff --git a/example/centos/centos-9-x86_64-tar.yaml b/example/centos/centos-9-x86_64-tar.yaml
@@ -14,7 +14,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - coreutils
@@ -34,7 +34,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - selinux-policy-targeted

diff --git a/example/centos/centos-9-x86_64-vhd.yaml b/example/centos/centos-9-x86_64-vhd.yaml
@@ -14,7 +14,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - coreutils
@@ -38,7 +38,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - "@Server"

diff --git a/example/centos/centos-9-x86_64-vmdk.yaml b/example/centos/centos-9-x86_64-vmdk.yaml
@@ -14,7 +14,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - coreutils
@@ -37,7 +37,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - "@core"

diff --git a/example/centos/centos-9-x86_64-wsl.yaml b/example/centos/centos-9-x86_64-wsl.yaml
@@ -9,7 +9,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - coreutils
@@ -29,7 +29,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories/${architecture}.yaml"
+          otk.include: "common/repository/generic.yaml"
         packages:
           include:
             - alternatives

diff --git a/...ple/centos/common/repository/aarch64.yaml → ...ple/centos/common/repository/generic.yaml b/...ple/centos/common/repository/aarch64.yaml → ...ple/centos/common/repository/generic.yaml
@@ -1,4 +1,4 @@
 - id: "AppStream"
-  baseurl: "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-appstream-20240901"
+  baseurl: "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-${architecture}-appstream-20240901"
 - id: "BaseOS"
-  baseurl: "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20240901"
+  baseurl: "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-${architecture}-baseos-20240901"
diff --git a/example/centos/common/repository/ppc64le.yaml b/example/centos/common/repository/ppc64le.yaml
diff --git a/example/centos/common/repository/s390x.yaml b/example/centos/common/repository/s390x.yaml