Merge pull request #35 from jpopelka/multi-arch

Make baseurls arch independent
fedora-ci · Jan 12, 2024 · d4982fe · d4982fe
2 parents 84505bd + 6330230
commit d4982fe
Show file tree

Hide file tree

Showing 66 changed files with 652 additions and 649 deletions.
diff --git a/mini-tps.spec b/mini-tps.spec
@@ -1,6 +1,6 @@
 Name: mini-tps
 Version: 0.1
-Release: 164%{?dist}
+Release: 165%{?dist}
 Summary: Mini TPS - Test Package Sanity
 
 License: GPLv2
@@ -64,6 +64,9 @@ install -pD -m 0755 profiles/fedora/prepare-system %{buildroot}%{_libexecdir}/mi
 
 
 %changelog
+* Fri Jan 12 2024 Jiri Popelka <[email protected]> - 0.1-165
+- multi-arch repos
+
 * Tue Jan 02 2024 Jiri Popelka <[email protected]> - 0.1-164
 - viewer (generate-result-json) related updates
 

diff --git a/profiles/centos-stream/repos/centos-stream-9.repo b/profiles/centos-stream/repos/centos-stream-9.repo
@@ -1,7 +1,7 @@
 ###### BASE OS ###########
 [baseos]
 name=CentOS Stream 9 - BaseOS
-baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/BaseOS/x86_64/os/
+baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/BaseOS/$basearch/os/
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
 gpgcheck=0
 repo_gpgcheck=0
@@ -12,7 +12,7 @@ skip_if_unavailable=True
 
 [baseos-debug]
 name=CentOS Stream 9 - BaseOS - Debug
-baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/BaseOS/x86_64/debug/tree/
+baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/BaseOS/$basearch/debug/tree/
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
 gpgcheck=0
 repo_gpgcheck=0
@@ -34,7 +34,7 @@ skip_if_unavailable=True
 ########### APPSTREAM ##################
 [appstream]
 name=CentOS Stream 9 - AppStream
-baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/AppStream/x86_64/os/
+baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/AppStream/$basearch/os/
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
 gpgcheck=0
 repo_gpgcheck=0
@@ -45,7 +45,7 @@ skip_if_unavailable=True
 
 [appstream-debug]
 name=CentOS Stream 9 - AppStream - Debug
-baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/AppStream/x86_64/debug/tree/
+baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/AppStream/$basearch/debug/tree/
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
 gpgcheck=0
 repo_gpgcheck=0
@@ -67,7 +67,7 @@ skip_if_unavailable=True
 ########### CRB ##################
 [crb]
 name=CentOS Stream 9 - CRB
-baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/CRB/x86_64/os/
+baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/CRB/$basearch/os/
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
 gpgcheck=0
 repo_gpgcheck=0
@@ -78,7 +78,7 @@ skip_if_unavailable=True
 
 [crb-debug]
 name=CentOS Stream 9 - CRB - Debug
-baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/CRB/x86_64/debug/tree/
+baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/CRB/$basearch/debug/tree/
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
 gpgcheck=0
 repo_gpgcheck=0
@@ -100,7 +100,7 @@ skip_if_unavailable=True
 ########### HighAvailability ##################
 [highavailability]
 name=CentOS Stream 9 - HighAvailability
-baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/HighAvailability/x86_64/os/
+baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/HighAvailability/$basearch/os/
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
 gpgcheck=0
 repo_gpgcheck=0
@@ -111,7 +111,7 @@ skip_if_unavailable=True
 
 [highavailability-debug]
 name=CentOS Stream 9 - HighAvailability - Debug
-baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/HighAvailability/x86_64/debug/tree/
+baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/HighAvailability/$basearch/debug/tree/
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
 gpgcheck=0
 repo_gpgcheck=0

diff --git a/profiles/rhel/repos/rhel-8.0.0-z.repo b/profiles/rhel/repos/rhel-8.0.0-z.repo
@@ -1,7 +1,7 @@
 ###### BASE OS ###########
 [rhel-8-base]
 name=RHEL-8 BaseOS
-baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.0/compose/BaseOS/x86_64/os/
+baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.0/compose/BaseOS/$basearch/os/
 enabled=1
 gpgcheck=0
 skip_if_unavailable=True
@@ -15,22 +15,22 @@ skip_if_unavailable=True
 
 [rhel-8-base-debug]
 name=RHEL-8 BaseOS Debug
-baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.0/compose/BaseOS/x86_64/debug/tree/
+baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.0/compose/BaseOS/$basearch/debug/tree/
 enabled=1
 gpgcheck=0
 skip_if_unavailable=True
 
 ########### APPSTREAM ##################
 [rhel-8-appstream]
 name=RHEL-8 AppStream
-baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.0/compose/AppStream/x86_64/os/
+baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.0/compose/AppStream/$basearch/os/
 enabled=1
 gpgcheck=0
 skip_if_unavailable=True
 
 [rhel-8-appstream-debug]
 name=RHEL-8 AppStream Debug
-baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.0/compose/AppStream/x86_64/debug/tree/
+baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.0/compose/AppStream/$basearch/debug/tree/
 enabled=1
 gpgcheck=0
 skip_if_unavailable=True
@@ -45,14 +45,14 @@ skip_if_unavailable=True
 ########### CRB ##################
 [rhel-8-crb]
 name=RHEL-8 CRB
-baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.0/compose/CRB/x86_64/os/
+baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.0/compose/CRB/$basearch/os/
 enabled=1
 gpgcheck=0
 skip_if_unavailable=True
 
 [rhel-8-crb-debug]
 name=RHEL-8 CRB Debug
-baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.0/compose/CRB/x86_64/debug/tree/
+baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.0/compose/CRB/$basearch/debug/tree/
 enabled=1
 gpgcheck=0
 skip_if_unavailable=True
@@ -67,14 +67,14 @@ skip_if_unavailable=True
 ########### HighAvailability ##################
 [rhel-8-highavailability]
 name=RHEL-8 HighAvailability
-baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.0/compose/HighAvailability/x86_64/os/
+baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.0/compose/HighAvailability/$basearch/os/
 enabled=1
 gpgcheck=0
 skip_if_unavailable=True
 
 [rhel-8-highavailability-debug]
 name=RHEL-8 HighAvailability Debug
-baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.0/compose/HighAvailability/x86_64/debug/tree/
+baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.0/compose/HighAvailability/$basearch/debug/tree/
 enabled=1
 gpgcheck=0
 skip_if_unavailable=True
@@ -136,14 +136,14 @@ skip_if_unavailable=True
 ########### ResilientStorage ##################
 [rhel-8-resilientstorage]
 name=RHEL-8 ResilientStorage
-baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.0/compose/ResilientStorage/x86_64/os/
+baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.0/compose/ResilientStorage/$basearch/os/
 enabled=1
 gpgcheck=0
 skip_if_unavailable=True
 
 [rhel-8-resilientstorage-debug]
 name=RHEL-8 ResilientStorage Debug
-baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.0/compose/ResilientStorage/x86_64/debug/tree/
+baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.0/compose/ResilientStorage/$basearch/debug/tree/
 enabled=1
 gpgcheck=0
 skip_if_unavailable=True

diff --git a/profiles/rhel/repos/rhel-8.0.0.repo b/profiles/rhel/repos/rhel-8.0.0.repo
@@ -1,7 +1,7 @@
 ###### BASE OS ###########
 [rhel-8-base]
 name=RHEL-8 BaseOS
-baseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.0.0/compose/BaseOS/x86_64/os/
+baseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.0.0/compose/BaseOS/$basearch/os/
 enabled=1
 gpgcheck=0
 skip_if_unavailable=True
@@ -15,22 +15,22 @@ skip_if_unavailable=True
 
 [rhel-8-base-debug]
 name=RHEL-8 BaseOS Debug
-baseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.0.0/compose/BaseOS/x86_64/debug/tree/
+baseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.0.0/compose/BaseOS/$basearch/debug/tree/
 enabled=1
 gpgcheck=0
 skip_if_unavailable=True
 
 ########### APPSTREAM ##################
 [rhel-8-appstream]
 name=RHEL-8 AppStream
-baseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.0.0/compose/AppStream/x86_64/os/
+baseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.0.0/compose/AppStream/$basearch/os/
 enabled=1
 gpgcheck=0
 skip_if_unavailable=True
 
 [rhel-8-appstream-debug]
 name=RHEL-8 AppStream Debug
-baseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.0.0/compose/AppStream/x86_64/debug/tree/
+baseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.0.0/compose/AppStream/$basearch/debug/tree/
 enabled=1
 gpgcheck=0
 skip_if_unavailable=True
@@ -45,14 +45,14 @@ skip_if_unavailable=True
 ########### CRB ##################
 [rhel-8-crb]
 name=RHEL-8 CRB
-baseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.0.0/compose/CRB/x86_64/os/
+baseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.0.0/compose/CRB/$basearch/os/
 enabled=1
 gpgcheck=0
 skip_if_unavailable=True
 
 [rhel-8-crb-debug]
 name=RHEL-8 CRB Debug
-baseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.0.0/compose/CRB/x86_64/debug/tree/
+baseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.0.0/compose/CRB/$basearch/debug/tree/
 enabled=1
 gpgcheck=0
 skip_if_unavailable=True
@@ -67,14 +67,14 @@ skip_if_unavailable=True
 ########### HighAvailability ##################
 [rhel-8-highavailability]
 name=RHEL-8 HighAvailability
-baseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.0.0/compose/HighAvailability/x86_64/os/
+baseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.0.0/compose/HighAvailability/$basearch/os/
 enabled=1
 gpgcheck=0
 skip_if_unavailable=True
 
 [rhel-8-highavailability-debug]
 name=RHEL-8 HighAvailability Debug
-baseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.0.0/compose/HighAvailability/x86_64/debug/tree/
+baseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.0.0/compose/HighAvailability/$basearch/debug/tree/
 enabled=1
 gpgcheck=0
 skip_if_unavailable=True
@@ -136,14 +136,14 @@ skip_if_unavailable=True
 ########### ResilientStorage ##################
 [rhel-8-resilientstorage]
 name=RHEL-8 ResilientStorage
-baseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.0.0/compose/ResilientStorage/x86_64/os/
+baseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.0.0/compose/ResilientStorage/$basearch/os/
 enabled=1
 gpgcheck=0
 skip_if_unavailable=True
 
 [rhel-8-resilientstorage-debug]
 name=RHEL-8 ResilientStorage Debug
-baseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.0.0/compose/ResilientStorage/x86_64/debug/tree/
+baseurl=http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.0.0/compose/ResilientStorage/$basearch/debug/tree/
 enabled=1
 gpgcheck=0
 skip_if_unavailable=True

diff --git a/profiles/rhel/repos/rhel-8.0.1-z.repo b/profiles/rhel/repos/rhel-8.0.1-z.repo
@@ -3,7 +3,7 @@
 ###### BASE OS ###########
 [rhel-8-base]
 name=RHEL-8 BaseOS
-baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.1/compose/BaseOS/x86_64/os/
+baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.1/compose/BaseOS/$basearch/os/
 enabled=1
 gpgcheck=0
 skip_if_unavailable=True
@@ -17,22 +17,22 @@ skip_if_unavailable=True
 
 [rhel-8-base-debug]
 name=RHEL-8 BaseOS Debug
-baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.1/compose/BaseOS/x86_64/debug/tree/
+baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.1/compose/BaseOS/$basearch/debug/tree/
 enabled=1
 gpgcheck=0
 skip_if_unavailable=True
 
 ########### APPSTREAM ##################
 [rhel-8-appstream]
 name=RHEL-8 AppStream
-baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.1/compose/AppStream/x86_64/os/
+baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.1/compose/AppStream/$basearch/os/
 enabled=1
 gpgcheck=0
 skip_if_unavailable=True
 
 [rhel-8-appstream-debug]
 name=RHEL-8 AppStream Debug
-baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.1/compose/AppStream/x86_64/debug/tree/
+baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.1/compose/AppStream/$basearch/debug/tree/
 enabled=1
 gpgcheck=0
 skip_if_unavailable=True
@@ -47,14 +47,14 @@ skip_if_unavailable=True
 ########### CRB ##################
 [rhel-8-crb]
 name=RHEL-8 CRB
-baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.1/compose/CRB/x86_64/os/
+baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.1/compose/CRB/$basearch/os/
 enabled=1
 gpgcheck=0
 skip_if_unavailable=True
 
 [rhel-8-crb-debug]
 name=RHEL-8 CRB Debug
-baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.1/compose/CRB/x86_64/debug/tree/
+baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.1/compose/CRB/$basearch/debug/tree/
 enabled=1
 gpgcheck=0
 skip_if_unavailable=True
@@ -69,14 +69,14 @@ skip_if_unavailable=True
 ########### HighAvailability ##################
 [rhel-8-highavailability]
 name=RHEL-8 HighAvailability
-baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.1/compose/HighAvailability/x86_64/os/
+baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.1/compose/HighAvailability/$basearch/os/
 enabled=1
 gpgcheck=0
 skip_if_unavailable=True
 
 [rhel-8-highavailability-debug]
 name=RHEL-8 HighAvailability Debug
-baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.1/compose/HighAvailability/x86_64/debug/tree/
+baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.1/compose/HighAvailability/$basearch/debug/tree/
 enabled=1
 gpgcheck=0
 skip_if_unavailable=True
@@ -138,14 +138,14 @@ skip_if_unavailable=True
 ########### ResilientStorage ##################
 [rhel-8-resilientstorage]
 name=RHEL-8 ResilientStorage
-baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.1/compose/ResilientStorage/x86_64/os/
+baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.1/compose/ResilientStorage/$basearch/os/
 enabled=1
 gpgcheck=0
 skip_if_unavailable=True
 
 [rhel-8-resilientstorage-debug]
 name=RHEL-8 ResilientStorage Debug
-baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.1/compose/ResilientStorage/x86_64/debug/tree/
+baseurl=http://download.devel.redhat.com/rhel-8/nightly/updates/RHEL-8/latest-RHEL-8.0.1/compose/ResilientStorage/$basearch/debug/tree/
 enabled=1
 gpgcheck=0
 skip_if_unavailable=True