From 61e102cf476865081aad2db144db8681c11b3f78 Mon Sep 17 00:00:00 2001
From: James Osborne <jameso@graphcore.ai>
Date: Fri, 22 Nov 2024 09:47:44 +0000
Subject: [PATCH 1/2] Amending paths to match Ark

- Treasuredata needs to reference v5 not v4 and the Ark path includes
  `lts`
- RabbitMQ path should reference `noarch` rather than `x86_64`

Found during the upgrade of Graphcore CL0 from Antelope to Caracal
---
 etc/kayobe/pulp.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml
index aa3c63d01..0c5246193 100644
--- a/etc/kayobe/pulp.yml
+++ b/etc/kayobe/pulp.yml
@@ -42,8 +42,8 @@ stackhpc_release_pulp_domain: "ark.stackhpc.com"
 stackhpc_release_pulp_url: "{{ stackhpc_release_pulp_scheme }}://{{ stackhpc_release_pulp_domain }}"
 
 # Credentials used to access the StackHPC Pulp service.
-stackhpc_release_pulp_username:
-stackhpc_release_pulp_password:
+stackhpc_release_pulp_username: graphcore
+stackhpc_release_pulp_password: "{{ secrets_stackhpc_release_pulp_password }}"
 
 # Content URL of the StackHPC Pulp service.
 stackhpc_release_pulp_content_url: "{{ stackhpc_release_pulp_url }}/pulp/content"
@@ -56,7 +56,7 @@ stackhpc_release_pulp_content_url_with_auth: "{{ stackhpc_release_pulp_scheme }}
 # Sync all repositories required for building Kolla images from the
 # StackHPC Ark Pulp service to local Pulp.
 # NOTE: Only RPM repositories are supported.
-stackhpc_pulp_sync_for_local_container_build: false
+stackhpc_pulp_sync_for_local_container_build: true
 
 ###############################################################################
 # Debs
@@ -252,7 +252,7 @@ stackhpc_pulp_rpm_repos:
     required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"
 
   - name: RabbitMQ - Server - RHEL 9
-    url: "{{ stackhpc_release_pulp_content_url }}/rabbitmq/rabbitmq-server/el/9/x86_64/{{ stackhpc_pulp_repo_rhel9_rabbitmq_server_version }}"
+    url: "{{ stackhpc_release_pulp_content_url }}/rabbitmq/rabbitmq-server/el/9/noarch/{{ stackhpc_pulp_repo_rhel9_rabbitmq_server_version }}"
     distribution_name: "rhel9-rabbitmq-server-"
     base_path: "rabbitmq/rabbitmq-server/el/9/x86_64/"
     required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"
@@ -344,7 +344,7 @@ stackhpc_pulp_rpm_repos:
 
   # Additional RHEL 9 repositories
   - name: TreasureData 5 for RHEL 9
-    url: "{{ stackhpc_release_pulp_content_url }}/treasuredata/4/redhat/9/x86_64/{{ stackhpc_pulp_repo_rhel_9_treasuredata_5_version }}"
+    url: "{{ stackhpc_release_pulp_content_url }}/treasuredata/lts/5/redhat/9/x86_64/{{ stackhpc_pulp_repo_rhel_9_treasuredata_5_version }}"
     distribution_name: "rhel-9-treasuredata-5-"
     base_path: "treasuredata/5/redhat/9/x86_64/"
     required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"

From 4f2aa0ca2fbb90bb1e6e972059af606026ab7af4 Mon Sep 17 00:00:00 2001
From: James Osborne <jameso@graphcore.ai>
Date: Fri, 22 Nov 2024 09:56:57 +0000
Subject: [PATCH 2/2] Changes as requested

---
 etc/kayobe/pulp.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml
index 0c5246193..a4f0b4b68 100644
--- a/etc/kayobe/pulp.yml
+++ b/etc/kayobe/pulp.yml
@@ -42,8 +42,8 @@ stackhpc_release_pulp_domain: "ark.stackhpc.com"
 stackhpc_release_pulp_url: "{{ stackhpc_release_pulp_scheme }}://{{ stackhpc_release_pulp_domain }}"
 
 # Credentials used to access the StackHPC Pulp service.
-stackhpc_release_pulp_username: graphcore
-stackhpc_release_pulp_password: "{{ secrets_stackhpc_release_pulp_password }}"
+stackhpc_release_pulp_username:
+stackhpc_release_pulp_password:
 
 # Content URL of the StackHPC Pulp service.
 stackhpc_release_pulp_content_url: "{{ stackhpc_release_pulp_url }}/pulp/content"
@@ -56,7 +56,7 @@ stackhpc_release_pulp_content_url_with_auth: "{{ stackhpc_release_pulp_scheme }}
 # Sync all repositories required for building Kolla images from the
 # StackHPC Ark Pulp service to local Pulp.
 # NOTE: Only RPM repositories are supported.
-stackhpc_pulp_sync_for_local_container_build: true
+stackhpc_pulp_sync_for_local_container_build: false
 
 ###############################################################################
 # Debs