example/centos: per-arch repositories

Make the repositories being included per architecture. Signed-off-by: Simon de Vlieger <[email protected]>
mvo5 · Sep 26, 2024 · 810deed · 810deed
1 parent bb5385e
commit 810deed
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 16 deletions.
diff --git a/example/centos/centos-9-aarch64-ami.yaml b/example/centos/centos-9-aarch64-ami.yaml
@@ -13,7 +13,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories.yaml"
+          otk.include: "common/repositories/aarch64.yaml"
         packages:
           include:
             - coreutils
@@ -35,7 +35,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories.yaml"
+          otk.include: "common/repositories/aarch64.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-qcow2.yaml b/example/centos/centos-9-aarch64-qcow2.yaml
@@ -13,7 +13,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories.yaml"
+          otk.include: "common/repositories/x86_64.yaml"
         packages:
           include:
             - coreutils
@@ -35,7 +35,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories.yaml"
+          otk.include: "common/repositories/x86_64.yaml"
         packages:
           include:
             - "@core"

diff --git a/example/centos/centos-9-aarch64-tar.yaml b/example/centos/centos-9-aarch64-tar.yaml
@@ -10,7 +10,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories.yaml"
+          otk.include: "common/repositories/aarch64.yaml"
         packages:
           include:
             - coreutils
@@ -30,7 +30,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories.yaml"
+          otk.include: "common/repositories/aarch64.yaml"
         packages:
           include:
             - selinux-policy-targeted

diff --git a/example/centos/centos-9-ppc64le-tar.yaml b/example/centos/centos-9-ppc64le-tar.yaml
@@ -10,7 +10,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories.yaml"
+          otk.include: "common/repositories/s390x.yaml"
         packages:
           include:
             - coreutils
@@ -30,7 +30,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories.yaml"
+          otk.include: "common/repositories/s390x.yaml"
         packages:
           include:
             - selinux-policy-targeted

diff --git a/example/centos/centos-9-s390x-tar.yaml b/example/centos/centos-9-s390x-tar.yaml
@@ -10,7 +10,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories.yaml"
+          otk.include: "common/repositories/s390x.yaml"
         packages:
           include:
             - coreutils
@@ -30,7 +30,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories.yaml"
+          otk.include: "common/repositories/s390x.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
@@ -13,7 +13,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories.yaml"
+          otk.include: "common/repositories/x86_64.yaml"
         packages:
           include:
             - coreutils
@@ -36,7 +36,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories.yaml"
+          otk.include: "common/repositories/x86_64.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-qcow2.yaml b/example/centos/centos-9-x86_64-qcow2.yaml
@@ -13,7 +13,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories.yaml"
+          otk.include: "common/repositories/x86_64.yaml"
         packages:
           include:
             - coreutils
@@ -36,7 +36,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories.yaml"
+          otk.include: "common/repositories/x86_64.yaml"
         packages:
           include:
             - "@core"

diff --git a/example/centos/centos-9-x86_64-tar.yaml b/example/centos/centos-9-x86_64-tar.yaml
@@ -10,7 +10,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories.yaml"
+          otk.include: "common/repositories/x86_64.yaml"
         packages:
           include:
             - coreutils
@@ -30,7 +30,7 @@ otk.define:
         module_platform_id: c9s
         releasever: "9"
         repositories:
-          otk.include: "common/repositories.yaml"
+          otk.include: "common/repositories/x86_64.yaml"
         packages:
           include:
             - selinux-policy-targeted

diff --git a/example/centos/common/repositories/aarch64.yaml b/example/centos/common/repositories/aarch64.yaml
@@ -0,0 +1,4 @@
+- id: "AppStream"
+  baseurl: "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-appstream-20240901"
+- id: "BaseOS"
+  baseurl: "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20240901"
diff --git a/example/centos/common/repositories/ppc64le.yaml b/example/centos/common/repositories/ppc64le.yaml
@@ -0,0 +1,4 @@
+- id: "AppStream"
+  baseurl: "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-ppc64le-appstream-20240901"
+- id: "BaseOS"
+  baseurl: "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-ppc64le-baseos-20240901"
diff --git a/example/centos/common/repositories/s390x.yaml b/example/centos/common/repositories/s390x.yaml
@@ -0,0 +1,4 @@
+- id: "AppStream"
+  baseurl: "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-s390x-appstream-20240901"
+- id: "BaseOS"
+  baseurl: "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-s390x-baseos-20240901"
diff --git a/example/centos/common/repositories.yaml → ...le/centos/common/repositories/x86_64.yaml b/example/centos/common/repositories.yaml → ...le/centos/common/repositories/x86_64.yaml