From 50c6ae16ea0dfc230d15481e451c8c2e0fba1d5f Mon Sep 17 00:00:00 2001
From: Owen Jones <owen@owenjones.net>
Date: Fri, 19 Jun 2026 15:40:34 +0100
Subject: [PATCH] fix: Enable Pulp proxy for seed container builds

* Add Pulp proxy hook for seed container build
* Pass proxy conf to seed build stage
* Only launch aarch64 builders if overcloud images are being built
---
 .github/workflows/stackhpc-container-image-build.yml | 12 ++++++++++--
 .../pre.d/10-pulp-auth-proxy.yml                     |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)
 create mode 120000 etc/kayobe/environments/ci-builder/hooks/seed-container-image-build/pre.d/10-pulp-auth-proxy.yml

diff --git a/.github/workflows/stackhpc-container-image-build.yml b/.github/workflows/stackhpc-container-image-build.yml
index 5520e87723..fbc016fe85 100644
--- a/.github/workflows/stackhpc-container-image-build.yml
+++ b/.github/workflows/stackhpc-container-image-build.yml
@@ -107,11 +107,15 @@ jobs:
           output="{'distro': ["
           if [[ ${{ inputs.rocky-linux-9 }} == 'true' ]]; then
               output+="{'name': 'rocky', 'release': 9, 'arch': 'amd64'},"
-              output+="{'name': 'rocky', 'release': 9, 'arch': 'aarch64', 'runner': 'sms'},"
+              if [[ ${{ inputs.overcloud }} == 'true' ]]; then
+                output+="{'name': 'rocky', 'release': 9, 'arch': 'aarch64', 'runner': 'sms'},"
+              fi
           fi
           if [[ ${{ inputs.rocky-linux-10 }} == 'true' ]]; then
               output+="{'name': 'rocky', 'release': 10, 'arch': 'amd64'},"
-              output+="{'name': 'rocky', 'release': 10, 'arch': 'aarch64', 'runner': 'sms-alternate'},"
+              if [[ ${{ inputs.overcloud }} == 'true' ]]; then
+                output+="{'name': 'rocky', 'release': 10, 'arch': 'aarch64', 'runner': 'sms-alternate'},"
+              fi
           fi
           if [[ ${{ inputs.ubuntu-noble }} == 'true' ]]; then
               output+="{'name': 'ubuntu', 'release': 'noble', 'arch': 'amd64'},"
@@ -247,6 +251,10 @@ jobs:
           args="$args -e kolla_base_distro_version=${{ matrix.distro.release }}"
           args="$args -e kolla_tag=${{ steps.write-kolla-tag.outputs.kolla-tag }}"
           args="$args -e stackhpc_repo_mirror_auth_proxy_enabled=true"
+          args="$args -e base_path=$GITHUB_WORKSPACE/opt/kayobe"
+          # NOTE: We override pulp_auth_proxy_conf_path to a path shared by the
+          # runner and dind containers.
+          args="$args -e pulp_auth_proxy_conf_path=/home/runner/_work/pulp_proxy"
           source venvs/kayobe/bin/activate &&
           source src/kayobe-config/kayobe-env --environment ci-builder &&
           kayobe seed container image build $args
diff --git a/etc/kayobe/environments/ci-builder/hooks/seed-container-image-build/pre.d/10-pulp-auth-proxy.yml b/etc/kayobe/environments/ci-builder/hooks/seed-container-image-build/pre.d/10-pulp-auth-proxy.yml
new file mode 120000
index 0000000000..2215b6aa03
--- /dev/null
+++ b/etc/kayobe/environments/ci-builder/hooks/seed-container-image-build/pre.d/10-pulp-auth-proxy.yml
@@ -0,0 +1 @@
+../../../../../ansible/pulp/pulp-auth-proxy.yml
\ No newline at end of file