Merge pull request #5621 from Particular/rhys/flaky-asb-test

Fix flaky ASB tests

Author: rbev

.github/workflows/ci.yml

@@ -64,6 +64,23 @@ jobs:
       - name: Smoke test PowerShell module import
         if: matrix.os-name == 'Windows'
         run: Import-Module ./deploy/PowerShellModules/Particular.ServiceControl.Management
+
+      # there is an issue with az cli and python 3.14, so for now we need to pin it
+      # once the issue is resolved it should be able to be re-floated
+      # https://github.com/Azure/azure-cli/issues/32980
+      - name: Set Python 3.13 (Linux)
+        if: matrix.os-name == 'Linux' && matrix.test-category == 'AzureServiceBus'
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.13'
+      - name: Install pinned Azure CLI on Python 3.13 (Linux)
+        if: matrix.os-name == 'Linux' && matrix.test-category == 'AzureServiceBus'
+        shell: bash
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install --user "azure-cli==2.64.0"
+          echo "$HOME/.local/bin" >> "$GITHUB_PATH"
+
       - name: Azure login
         uses: azure/login@v3.0.0
         if: matrix.test-category == 'AzureServiceBus' || matrix.test-category == 'AzureStorageQueues' || matrix.test-category == 'RabbitMQ' || matrix.test-category == 'PostgreSQL'
@@ -92,7 +109,7 @@ jobs:
           registry-username: ${{ secrets.DOCKERHUB_USERNAME }}
           registry-password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Setup Azure Service Bus
-        uses: Particular/setup-azureservicebus-action@v2.3.0
+        uses: Particular/setup-azureservicebus-action@v2.4.0
         if: matrix.test-category == 'AzureServiceBus'
         with:
           connection-string-name: ServiceControl_TransportTests_ASBS_ConnectionString

.github/workflows/container-integration-test.yml

@@ -57,6 +57,23 @@ jobs:
         uses: actions/setup-dotnet@v6.0.0
         with:
           global-json-file: global.json
+
+      # there is an issue with az cli and python 3.14, so for now we need to pin it
+      # once the issue is resolved it should be able to be re-floated
+      # https://github.com/Azure/azure-cli/issues/32980
+      - name: Set Python 3.13 (Linux)
+        if: matrix.name == 'asb'
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.13'
+      - name: Install pinned Azure CLI on Python 3.13 (Linux)
+        if: matrix.name == 'asb'
+        shell: bash
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install --user "azure-cli==2.64.0"
+          echo "$HOME/.local/bin" >> "$GITHUB_PATH"
+
       - name: Run MinVer
         uses: Particular/run-minver-action@v1.0.0
       - name: Log in to GitHub container registry