From ad2ce65782ee4a33108383c659e531f3882a9fc8 Mon Sep 17 00:00:00 2001 From: sophia-chen-ttd <152837545+sophia-chen-ttd@users.noreply.github.com> Date: Fri, 30 Oct 2026 09:33:04 +1100 Subject: [PATCH] UID2-8220: Pin confcom instead of azure-cli in Azure artifact jobs (#2801) * UID2-8220 Pin Azure artifact jobs to ubuntu-24.04 ubuntu-latest now resolves to Ubuntu 26.04, whose azure-cli apt repo has no 2.61.0. Co-Authored-By: Claude Sonnet 5.5 * [CI Pipeline] Released Snapshot version: 5.70.356-alpha-266-SNAPSHOT [no-jira - reason: automated release] Automated release (PR #2802). * [CI Pipeline] Released Snapshot version: 5.70.357-alpha-267-SNAPSHOT [no-jira - reason: automated release] Automated release (PR #2803). * UID2-8220 Restore pom.xml version to 5.70.355 Undo the Snapshot version bumps committed by test runs of the publish workflow. Co-Authored-By: Claude Sonnet 5.5 * UID2-8220 Pin confcom extension instead of azure-cli Drop the azure-cli 2.61.0 pin and run on ubuntu-latest. The confcom extension generates the CCE policy, so pin it to 2.4.1. Co-Authored-By: Claude Sonnet 5.5 * UID2-8220 Keep install_az_cli action for future use Co-Authored-By: Claude Sonnet 5.5 --------- Co-authored-by: Claude Sonnet 5.5 Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> (cherry picked from commit ad94df5dbef1d4f6d248ebb3576195c696d6f4ab) --- .github/workflows/publish-azure-cc-enclave-docker.yaml | 6 ------ .../azure-aks/deployment/generate-deployment-artifacts.sh | 2 +- .../azure-cc/deployment/generate-deployment-artifacts.sh | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/publish-azure-cc-enclave-docker.yaml b/.github/workflows/publish-azure-cc-enclave-docker.yaml index df61469a9..ffa8e87b9 100644 --- a/.github/workflows/publish-azure-cc-enclave-docker.yaml +++ b/.github/workflows/publish-azure-cc-enclave-docker.yaml @@ -176,9 +176,6 @@ jobs: - name: Checkout uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - - name: Install Azure CLI - uses: ./.github/actions/install_az_cli - - name: check azure-cli version run: | az --version @@ -224,9 +221,6 @@ jobs: - name: Checkout uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - - name: Install Azure CLI - uses: ./.github/actions/install_az_cli - - name: check azure-cli version run: | az --version diff --git a/scripts/azure-aks/deployment/generate-deployment-artifacts.sh b/scripts/azure-aks/deployment/generate-deployment-artifacts.sh index 895b0bb96..7ca4c36b4 100644 --- a/scripts/azure-aks/deployment/generate-deployment-artifacts.sh +++ b/scripts/azure-aks/deployment/generate-deployment-artifacts.sh @@ -57,7 +57,7 @@ az version sudo /opt/az/bin/python3 -m pip install --upgrade typing_extensions # Install confcom extension, az is originally available in GitHub workflow environment -az extension add --name confcom +az extension add --name confcom --version 2.4.1 if [[ $? -ne 0 ]]; then echo "Failed to install Azure confcom extension" exit 1 diff --git a/scripts/azure-cc/deployment/generate-deployment-artifacts.sh b/scripts/azure-cc/deployment/generate-deployment-artifacts.sh index 5c6214243..7ae551aaa 100644 --- a/scripts/azure-cc/deployment/generate-deployment-artifacts.sh +++ b/scripts/azure-cc/deployment/generate-deployment-artifacts.sh @@ -60,7 +60,7 @@ az version sudo /opt/az/bin/python3 -m pip install --upgrade typing_extensions # Install confcom extension, az is originally available in GitHub workflow environment -az extension add --name confcom +az extension add --name confcom --version 2.4.1 if [[ $? -ne 0 ]]; then echo "Failed to install Azure confcom extension" exit 1