From 6b1cd9e7208af5be2893ed44e9e6abbd270a560a Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <daniel.wozniak@broadcom.com>
Date: Mon, 20 Jan 2025 19:13:20 -0700
Subject: [PATCH] Make setup python tools work with python 3.12

---
 .github/actions/setup-python-tools-scripts/action.yml | 3 +++
 .github/workflows/build-packages.yml                  | 2 +-
 tools/ci.py                                           | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/actions/setup-python-tools-scripts/action.yml b/.github/actions/setup-python-tools-scripts/action.yml
index e640ffe86f7..21390a12c4a 100644
--- a/.github/actions/setup-python-tools-scripts/action.yml
+++ b/.github/actions/setup-python-tools-scripts/action.yml
@@ -54,10 +54,13 @@ runs:
       working-directory: ${{ inputs.cwd }}
       run: |
         PYTHON_EXE=${{ steps.tools-virtualenv.outputs.python-executable }}
+        ${PYTHON_EXE} -m ensurepip --upgrade
         (${PYTHON_EXE} -m pip install --help | grep break-system-packages > /dev/null 2>&1) && exitcode=0 || exitcode=1
         if [ $exitcode -eq 0 ]; then
+          ${PYTHON_EXE} -m pip install --break-system-packages --upgrade setuptools
           ${PYTHON_EXE} -m pip install --break-system-packages -r requirements/static/ci/py${{ steps.get-python-version.outputs.version }}/tools.txt
         else
+          ${PYTHON_EXE} -m pip install --upgrade setuptools
           ${PYTHON_EXE} -m pip install -r requirements/static/ci/py${{ steps.get-python-version.outputs.version }}/tools.txt
         fi
 
diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
index d30aca87ad6..f7430486cc8 100644
--- a/.github/workflows/build-packages.yml
+++ b/.github/workflows/build-packages.yml
@@ -152,7 +152,7 @@ jobs:
     name: RPM
     if: ${{ toJSON(fromJSON(inputs.matrix)['linux']) != '[]' }}
     runs-on:
-      - ${{ matrix.arch == 'x86_64' && 'ubuntu-22.04' || 'linux-arm64' }}
+      - ${{ matrix.arch == 'x86_64' && 'ubuntu-22.04' || inputs.linux_arm_runner }}
     strategy:
       fail-fast: false
       matrix:
diff --git a/tools/ci.py b/tools/ci.py
index 3a3a1e73fe4..acebf63eb12 100644
--- a/tools/ci.py
+++ b/tools/ci.py
@@ -1573,7 +1573,7 @@ def workflow_config(
                 config["linux_arm_runner"] = os.environ["LINUX_ARM_RUNNER"]
         else:
             # Public repositories can use github's arm64 runners.
-            config["linux_arm_runner"] = "ubuntu-24.04-arm"
+            config["linux_arm_runner"] = "ubuntu-22.04-arm"
 
     ctx.info(f"{'==== labels ====':^80s}")
     ctx.info(f"{pprint.pformat(labels)}")