From 9e596290d367094f56d612fe5e715094682710b0 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Fri, 14 Jun 2024 11:33:05 +0200
Subject: [PATCH] configs: c10s config update

- use metalinks instead of compose URLs, the same is happening in
  centos-release: https://gitlab.com/redhat/centos-stream/rpms/centos-release/-/merge_requests/54
- sync a bit with c9s (order of repositories, repo config options)
- set metadata_expire=1
- drop repo_gpgcheck=0 which is the DNF default (and we don't use it in
  most of the other configs)
---
 .../etc/mock/templates/centos-stream-10.tpl   | 70 ++++++++-----------
 1 file changed, 31 insertions(+), 39 deletions(-)

diff --git a/mock-core-configs/etc/mock/templates/centos-stream-10.tpl b/mock-core-configs/etc/mock/templates/centos-stream-10.tpl
index 850a030c9..0bae9f98a 100644
--- a/mock-core-configs/etc/mock/templates/centos-stream-10.tpl
+++ b/mock-core-configs/etc/mock/templates/centos-stream-10.tpl
@@ -20,9 +20,11 @@ gpgcheck=0
 assumeyes=1
 syslog_ident=mock
 syslog_device=
+metadata_expire=0
 best=1
 install_weak_deps=0
 protected_packages=
+skip_if_unavailable=False
 module_platform_id=platform:el10
 user_agent={{ user_agent }}
 
@@ -35,27 +37,49 @@ name=CentOS Stream $releasever - Koji Local - BUILDROOT ONLY!
 baseurl=https://kojihub.stream.centos.org/kojifiles/repos/c{{ releasever }}s-build/latest/$basearch/
 cost=2000
 enabled=0
-skip_if_unavailable=False
 
 [baseos]
 name=CentOS Stream $releasever - BaseOS
-baseurl=https://composes.stream.centos.org/stream-10/production/latest-CentOS-Stream/compose/BaseOS/$basearch/os
-#metalink=https://mirrors.centos.org/metalink?repo=centos-baseos-$stream&arch=$basearch&protocol=https,http
+#baseurl=http://mirror.stream.centos.org/$releasever-stream/BaseOS/$basearch/os/
+metalink=https://mirrors.centos.org/metalink?repo=centos-baseos-$releasever-stream&arch=$basearch&protocol=https,http
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official-SHA256
+gpgcheck=1
+countme=1
+enabled=1
+
+[appstream]
+name=CentOS Stream $releasever - AppStream
+#baseurl=http://mirror.stream.centos.org/$releasever-stream/AppStream/$basearch/os/
+metalink=https://mirrors.centos.org/metalink?repo=centos-appstream-$releasever-stream&arch=$basearch&protocol=https,http
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official-SHA256
 gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=6h
 countme=1
 enabled=1
 
+[crb]
+name=CentOS Stream $releasever - CRB
+#baseurl=http://mirror.stream.centos.org/$releasever-stream/CRB/$basearch/os/
+metalink=https://mirrors.centos.org/metalink?repo=centos-crb-$releasever-stream&arch=$basearch&protocol=https,http
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official-SHA256
+gpgcheck=1
+countme=1
+enabled=1
+
+[extras-common]
+name=CentOS Stream $releasever - Extras packages
+#baseurl=http://mirror.stream.centos.org/SIGs/$releasever-stream/extras/$basearch/extras-common/
+metalink=https://mirrors.centos.org/metalink?repo=centos-extras-sig-extras-common-$releasever-stream&arch=$basearch&protocol=https,http
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official-SHA256
+gpgcheck=1
+enabled=1
+skip_if_unavailable=False
+
 [baseos-debuginfo]
 name=CentOS Stream $releasever - BaseOS - Debug
 baseurl=https://composes.stream.centos.org/stream-10/production/latest-CentOS-Stream/compose/BaseOS/$basearch/debug/tree/
 #metalink=https://mirrors.centos.org/metalink?repo=centos-baseos-debug-$stream&arch=$basearch&protocol=https,http
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official-SHA256
 gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=6h
 enabled=0
 
 [baseos-source]
@@ -64,29 +88,14 @@ baseurl=https://composes.stream.centos.org/stream-10/production/latest-CentOS-St
 #metalink=https://mirrors.centos.org/metalink?repo=centos-baseos-source-$stream&arch=source&protocol=https,http
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official-SHA256
 gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=6h
 enabled=0
 
-[appstream]
-name=CentOS Stream $releasever - AppStream
-baseurl=https://composes.stream.centos.org/stream-10/production/latest-CentOS-Stream/compose/AppStream/$basearch/os
-#metalink=https://mirrors.centos.org/metalink?repo=centos-appstream-$stream&arch=$basearch&protocol=https,http
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official-SHA256
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=6h
-countme=1
-enabled=1
-
 [appstream-debuginfo]
 name=CentOS Stream $releasever - AppStream - Debug
 baseurl=https://composes.stream.centos.org/stream-10/production/latest-CentOS-Stream/compose/AppStream/$basearch/debug/tree/
 #metalink=https://mirrors.centos.org/metalink?repo=centos-appstream-debug-$stream&arch=$basearch&protocol=https,http
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official-SHA256-SHA256
 gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=6h
 enabled=0
 
 [appstream-source]
@@ -95,29 +104,14 @@ baseurl=https://composes.stream.centos.org/stream-10/production/latest-CentOS-St
 #metalink=https://mirrors.centos.org/metalink?repo=centos-appstream-source-$stream&arch=source&protocol=https,http
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official-SHA256
 gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=6h
 enabled=0
 
-[crb]
-name=CentOS Stream $releasever - CRB
-baseurl=https://composes.stream.centos.org/stream-10/production/latest-CentOS-Stream/compose/CRB/$basearch/os
-#metalink=https://mirrors.centos.org/metalink?repo=centos-crb-$stream&arch=$basearch&protocol=https,http
-gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official-SHA256
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=6h
-countme=1
-enabled=1
-
 [crb-debuginfo]
 name=CentOS Stream $releasever - CRB - Debug
 baseurl=https://composes.stream.centos.org/stream-10/production/latest-CentOS-Stream/compose/CRB/$basearch/debug/tree/
 #metalink=https://mirrors.centos.org/metalink?repo=centos-crb-debug-$stream&arch=$basearch&protocol=https,http
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official-SHA256
 gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=6h
 enabled=0
 
 [crb-source]
@@ -126,7 +120,5 @@ baseurl=https://composes.stream.centos.org/stream-10/production/latest-CentOS-St
 #metalink=https://mirrors.centos.org/metalink?repo=centos-crb-source-$stream&arch=source&protocol=https,http
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official-SHA256
 gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=6h
 enabled=0
 """