From 2f7418eab89a0936b4af518579f15bac842b53f4 Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Thu, 6 Apr 2023 16:12:06 +0200
Subject: [PATCH 1/3] Fix CRB repository mirror URL

The Rocky Linux 9 CRB repository lives upstream at /pub/rocky/9/CRB, but
it was getting mirrored to /pulp/content/rocky/9/crb, which was not
matching the location defined with stackhpc_repo_rocky_9_crb_url.
---
 etc/kayobe/pulp.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml
index d98d96e6b..52e49895c 100644
--- a/etc/kayobe/pulp.yml
+++ b/etc/kayobe/pulp.yml
@@ -755,7 +755,7 @@ stackhpc_pulp_distribution_rpm_development:
     required: "{{ stackhpc_pulp_sync_rocky_9 | bool }}"
   - name: "rocky-9-crb-development"
     repository: Rocky Linux 9 - CRB
-    base_path: "rocky/9/crb/x86_64/os/development"
+    base_path: "rocky/9/CRB/x86_64/os/development"
     state: present
     required: "{{ stackhpc_pulp_sync_rocky_9 | bool }}"
   - name: "rocky-9-highavailability-development"
@@ -954,7 +954,7 @@ stackhpc_pulp_distribution_rpm_production:
     required: "{{ stackhpc_pulp_sync_rocky_9 | bool }}"
   - name: "rocky-9-crb-production"
     repository: Rocky Linux 9 - CRB
-    base_path: "rocky/9/crb/x86_64/os/production"
+    base_path: "rocky/9/CRB/x86_64/os/production"
     state: present
     required: "{{ stackhpc_pulp_sync_rocky_9 | bool }}"
   - name: "rocky-9-highavailability-production"

From 2d894a5553cf12f5e1e6de193a66a2350c71c32c Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Thu, 6 Apr 2023 16:12:55 +0200
Subject: [PATCH 2/3] Configure Rocky Linux 9 CRB YUM repository

This is necessary to install packages purely from Pulp.
---
 etc/kayobe/dnf.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/etc/kayobe/dnf.yml b/etc/kayobe/dnf.yml
index 95605aeb8..06227e348 100644
--- a/etc/kayobe/dnf.yml
+++ b/etc/kayobe/dnf.yml
@@ -149,6 +149,12 @@ dnf_custom_repos_rocky_9:
     file: rocky
     gpgkey: "{{ rocky_9_gpg_key }}"
     gpgcheck: yes
+  crb:
+    baseurl: "{{ stackhpc_repo_rocky_9_crb_url }}"
+    description: "Rocky Linux $releasever - CRB"
+    file: rocky
+    gpgkey: "{{ rocky_9_gpg_key }}"
+    gpgcheck: yes
   extras:
     baseurl: "{{ stackhpc_repo_rocky_9_extras_url }}"
     description: "Rocky Linux $releasever - Extras"

From da9766a133d58e3cb46d8374141945b3abea3db5 Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Thu, 6 Apr 2023 16:22:26 +0200
Subject: [PATCH 3/3] Add release note for Rocky Linux 9 CRB fixes.

---
 releasenotes/notes/rocky-crb-b6a6cecfdf4d93a4.yaml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 releasenotes/notes/rocky-crb-b6a6cecfdf4d93a4.yaml

diff --git a/releasenotes/notes/rocky-crb-b6a6cecfdf4d93a4.yaml b/releasenotes/notes/rocky-crb-b6a6cecfdf4d93a4.yaml
new file mode 100644
index 000000000..9c44abcfc
--- /dev/null
+++ b/releasenotes/notes/rocky-crb-b6a6cecfdf4d93a4.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    Fixes synchronisation and DNF configuration of the Rocky Linux 9 CRB repository.