From 5b93df5f84d1d049bb73cccfab7e6de9cb04fa69 Mon Sep 17 00:00:00 2001
From: Rhys Bevilaqua <rhys.bevilaqua@particular.net>
Date: Fri, 16 Oct 2026 14:55:43 +0800
Subject: [PATCH] re-pin the az cli on linux

---
 .github/actions/pin-azure-cli/action.yml      | 19 +++++++++++++++++++
 .github/actions/upgrade-azure-cli/action.yml  | 13 -------------
 .github/workflows/ci.yml                      |  4 ++--
 .../workflows/container-integration-test.yml  |  4 ++--
 4 files changed, 23 insertions(+), 17 deletions(-)
 create mode 100644 .github/actions/pin-azure-cli/action.yml
 delete mode 100644 .github/actions/upgrade-azure-cli/action.yml

diff --git a/.github/actions/pin-azure-cli/action.yml b/.github/actions/pin-azure-cli/action.yml
new file mode 100644
index 0000000000..d34075ab87
--- /dev/null
+++ b/.github/actions/pin-azure-cli/action.yml
@@ -0,0 +1,19 @@
+name: Pin Azure CLI
+description: Installs Azure CLI 2.83.0 on Linux runners and upgrades Azure CLI on Windows runners
+runs:
+  using: composite
+  steps:
+    - name: Pin Azure CLI on Linux
+      if: runner.os == 'Linux'
+      shell: bash
+      # Avoid the Python module-loader deadlock: https://github.com/Azure/azure-cli/issues/32869
+      run: |
+        set -eo pipefail
+        curl -fsSL 'https://azurecliprod.blob.core.windows.net/$root/deb_install.sh' | sudo bash
+        echo "Available versions:"
+        apt-cache policy azure-cli
+        sudo apt-get install --allow-downgrades -y azure-cli=2.83.0-1~noble
+        which az
+        az --version
+        python3 --version
+        echo "ImageVersion: $ImageVersion"
diff --git a/.github/actions/upgrade-azure-cli/action.yml b/.github/actions/upgrade-azure-cli/action.yml
deleted file mode 100644
index 7211bf829c..0000000000
--- a/.github/actions/upgrade-azure-cli/action.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: Upgrade Azure CLI
-description: Upgrades Azure CLI on Linux and Windows runners
-runs:
-  using: composite
-  steps:
-    - name: Upgrade Azure CLI on Linux
-      if: runner.os == 'Linux'
-      shell: bash
-      run: curl -fsSL 'https://azurecliprod.blob.core.windows.net/$root/deb_install.sh' | sudo bash
-    - name: Upgrade Azure CLI on Windows
-      if: runner.os == 'Windows'
-      shell: pwsh
-      run: az upgrade --yes
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d0ff950abb..47154ca3e3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -57,9 +57,9 @@ jobs:
         uses: actions/checkout@v7.0.1
         with:
           fetch-depth: 0
-      - name: Upgrade Azure CLI
+      - name: Pin Azure CLI
         if: matrix.test-category == 'AzureServiceBus' || matrix.test-category == 'AzureStorageQueues'
-        uses: ./.github/actions/upgrade-azure-cli
+        uses: ./.github/actions/pin-azure-cli
       - name: Move NuGet caches to the temp drive
         uses: ./.github/actions/nuget-cache-location
       - name: Setup .NET SDK
diff --git a/.github/workflows/container-integration-test.yml b/.github/workflows/container-integration-test.yml
index bf2b77f955..548e4e2120 100644
--- a/.github/workflows/container-integration-test.yml
+++ b/.github/workflows/container-integration-test.yml
@@ -53,9 +53,9 @@ jobs:
         uses: actions/checkout@v7.0.1
         with:
           fetch-depth: 0
-      - name: Upgrade Azure CLI
+      - name: Pin Azure CLI
         if: matrix.name == 'asb' || matrix.name == 'asq'
-        uses: ./.github/actions/upgrade-azure-cli
+        uses: ./.github/actions/pin-azure-cli
       - name: Setup .NET SDK
         uses: actions/setup-dotnet@v6.0.0
         with: