From 876310854d673c0ea5bcb121b28775f745688f80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bombo?= Date: Tue, 30 Jun 2026 09:21:33 -0500 Subject: [PATCH] ci: switch azure creds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aurélien Bombo --- .github/workflows/ci-devel.yaml | 6 +++--- .github/workflows/ci-nightly.yaml | 6 +++--- .github/workflows/ci-on-push.yaml | 6 +++--- .github/workflows/ci.yaml | 18 +++++++++--------- .github/workflows/cleanup-resources.yaml | 8 ++++---- .github/workflows/run-k8s-tests-on-aks.yaml | 18 +++++++++--------- .github/workflows/run-kata-coco-tests.yaml | 6 +++--- tests/cleanup_resources.py | 2 +- 8 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.github/workflows/ci-devel.yaml b/.github/workflows/ci-devel.yaml index 72293f64e7..1db8b21c9d 100644 --- a/.github/workflows/ci-devel.yaml +++ b/.github/workflows/ci-devel.yaml @@ -35,9 +35,9 @@ jobs: secrets: AUTHENTICATED_IMAGE_PASSWORD: ${{ secrets.AUTHENTICATED_IMAGE_PASSWORD }} - AZ_APPID: ${{ secrets.AZ_APPID }} - AZ_TENANT_ID: ${{ secrets.AZ_TENANT_ID }} - AZ_SUBSCRIPTION_ID: ${{ secrets.AZ_SUBSCRIPTION_ID }} + AZ_APPID2: ${{ secrets.AZ_APPID2 }} + AZ_TENANT_ID2: ${{ secrets.AZ_TENANT_ID2 }} + AZ_SUBSCRIPTION_ID2: ${{ secrets.AZ_SUBSCRIPTION_ID2 }} QUAY_DEPLOYER_PASSWORD: ${{ secrets.QUAY_DEPLOYER_PASSWORD }} NGC_API_KEY: ${{ secrets.NGC_API_KEY }} KBUILD_SIGN_PIN: ${{ secrets.KBUILD_SIGN_PIN }} diff --git a/.github/workflows/ci-nightly.yaml b/.github/workflows/ci-nightly.yaml index 94be0167b2..fc6246326c 100644 --- a/.github/workflows/ci-nightly.yaml +++ b/.github/workflows/ci-nightly.yaml @@ -26,9 +26,9 @@ jobs: tee-test-scope: "full" secrets: AUTHENTICATED_IMAGE_PASSWORD: ${{ secrets.AUTHENTICATED_IMAGE_PASSWORD }} - AZ_APPID: ${{ secrets.AZ_APPID }} - AZ_TENANT_ID: ${{ secrets.AZ_TENANT_ID }} - AZ_SUBSCRIPTION_ID: ${{ secrets.AZ_SUBSCRIPTION_ID }} + AZ_APPID2: ${{ secrets.AZ_APPID2 }} + AZ_TENANT_ID2: ${{ secrets.AZ_TENANT_ID2 }} + AZ_SUBSCRIPTION_ID2: ${{ secrets.AZ_SUBSCRIPTION_ID2 }} QUAY_DEPLOYER_PASSWORD: ${{ secrets.QUAY_DEPLOYER_PASSWORD }} NGC_API_KEY: ${{ secrets.NGC_API_KEY }} KBUILD_SIGN_PIN: ${{ secrets.KBUILD_SIGN_PIN }} diff --git a/.github/workflows/ci-on-push.yaml b/.github/workflows/ci-on-push.yaml index 50de5e29a9..bd9dbb3fa4 100644 --- a/.github/workflows/ci-on-push.yaml +++ b/.github/workflows/ci-on-push.yaml @@ -44,9 +44,9 @@ jobs: skip-test: ${{ needs.skipper.outputs.skip_test }} secrets: AUTHENTICATED_IMAGE_PASSWORD: ${{ secrets.AUTHENTICATED_IMAGE_PASSWORD }} - AZ_APPID: ${{ secrets.AZ_APPID }} - AZ_TENANT_ID: ${{ secrets.AZ_TENANT_ID }} - AZ_SUBSCRIPTION_ID: ${{ secrets.AZ_SUBSCRIPTION_ID }} + AZ_APPID2: ${{ secrets.AZ_APPID2 }} + AZ_TENANT_ID2: ${{ secrets.AZ_TENANT_ID2 }} + AZ_SUBSCRIPTION_ID2: ${{ secrets.AZ_SUBSCRIPTION_ID2 }} QUAY_DEPLOYER_PASSWORD: ${{ secrets.QUAY_DEPLOYER_PASSWORD }} NGC_API_KEY: ${{ secrets.NGC_API_KEY }} KBUILD_SIGN_PIN: ${{ secrets.KBUILD_SIGN_PIN }} diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f1d0bbe184..f5cd5c7b67 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -31,11 +31,11 @@ on: AUTHENTICATED_IMAGE_PASSWORD: required: true - AZ_APPID: + AZ_APPID2: required: true - AZ_TENANT_ID: + AZ_TENANT_ID2: required: true - AZ_SUBSCRIPTION_ID: + AZ_SUBSCRIPTION_ID2: required: true QUAY_DEPLOYER_PASSWORD: required: true @@ -336,9 +336,9 @@ jobs: pr-number: ${{ inputs.pr-number }} target-branch: ${{ inputs.target-branch }} secrets: - AZ_APPID: ${{ secrets.AZ_APPID }} - AZ_TENANT_ID: ${{ secrets.AZ_TENANT_ID }} - AZ_SUBSCRIPTION_ID: ${{ secrets.AZ_SUBSCRIPTION_ID }} + AZ_APPID2: ${{ secrets.AZ_APPID2 }} + AZ_TENANT_ID2: ${{ secrets.AZ_TENANT_ID2 }} + AZ_SUBSCRIPTION_ID2: ${{ secrets.AZ_SUBSCRIPTION_ID2 }} run-k8s-tests-on-free-runner: if: ${{ inputs.skip-test != 'yes' }} @@ -422,9 +422,9 @@ jobs: tee-test-scope: ${{ inputs.tee-test-scope }} secrets: AUTHENTICATED_IMAGE_PASSWORD: ${{ secrets.AUTHENTICATED_IMAGE_PASSWORD }} - AZ_APPID: ${{ secrets.AZ_APPID }} - AZ_TENANT_ID: ${{ secrets.AZ_TENANT_ID }} - AZ_SUBSCRIPTION_ID: ${{ secrets.AZ_SUBSCRIPTION_ID }} + AZ_APPID2: ${{ secrets.AZ_APPID2 }} + AZ_TENANT_ID2: ${{ secrets.AZ_TENANT_ID2 }} + AZ_SUBSCRIPTION_ID2: ${{ secrets.AZ_SUBSCRIPTION_ID2 }} run-k8s-tests-on-zvsi: if: ${{ inputs.skip-test != 'yes' }} diff --git a/.github/workflows/cleanup-resources.yaml b/.github/workflows/cleanup-resources.yaml index 14612e5d9a..4efe2e1b47 100644 --- a/.github/workflows/cleanup-resources.yaml +++ b/.github/workflows/cleanup-resources.yaml @@ -27,9 +27,9 @@ jobs: - name: Log into Azure uses: azure/login@532459ea530d8321f2fb9bb10d1e0bcf23869a43 # v3.0.0 with: - client-id: ${{ secrets.AZ_APPID }} - tenant-id: ${{ secrets.AZ_TENANT_ID }} - subscription-id: ${{ secrets.AZ_SUBSCRIPTION_ID }} + client-id: ${{ secrets.AZ_APPID2 }} + tenant-id: ${{ secrets.AZ_TENANT_ID2 }} + subscription-id: ${{ secrets.AZ_SUBSCRIPTION_ID2 }} - name: Install Python dependencies run: | @@ -39,6 +39,6 @@ jobs: - name: Cleanup resources env: - AZ_SUBSCRIPTION_ID: ${{ secrets.AZ_SUBSCRIPTION_ID }} + AZ_SUBSCRIPTION_ID2: ${{ secrets.AZ_SUBSCRIPTION_ID2 }} CLEANUP_AFTER_HOURS: 24 # Clean up resources created more than this many hours ago. run: python3 tests/cleanup_resources.py diff --git a/.github/workflows/run-k8s-tests-on-aks.yaml b/.github/workflows/run-k8s-tests-on-aks.yaml index a58deadca7..d40ed0bf9a 100644 --- a/.github/workflows/run-k8s-tests-on-aks.yaml +++ b/.github/workflows/run-k8s-tests-on-aks.yaml @@ -26,11 +26,11 @@ on: default: "" secrets: - AZ_APPID: + AZ_APPID2: required: true - AZ_TENANT_ID: + AZ_TENANT_ID2: required: true - AZ_SUBSCRIPTION_ID: + AZ_SUBSCRIPTION_ID2: required: true concurrency: @@ -114,9 +114,9 @@ jobs: - name: Log into the Azure account uses: azure/login@532459ea530d8321f2fb9bb10d1e0bcf23869a43 # v3.0.0 with: - client-id: ${{ secrets.AZ_APPID }} - tenant-id: ${{ secrets.AZ_TENANT_ID }} - subscription-id: ${{ secrets.AZ_SUBSCRIPTION_ID }} + client-id: ${{ secrets.AZ_APPID2 }} + tenant-id: ${{ secrets.AZ_TENANT_ID2 }} + subscription-id: ${{ secrets.AZ_SUBSCRIPTION_ID2 }} - name: Create AKS cluster uses: nick-fields/retry@ad984534de44a9489a53aefd81eb77f87c70dc60 # v4.0.0 @@ -154,9 +154,9 @@ jobs: if: always() uses: azure/login@532459ea530d8321f2fb9bb10d1e0bcf23869a43 # v3.0.0 with: - client-id: ${{ secrets.AZ_APPID }} - tenant-id: ${{ secrets.AZ_TENANT_ID }} - subscription-id: ${{ secrets.AZ_SUBSCRIPTION_ID }} + client-id: ${{ secrets.AZ_APPID2 }} + tenant-id: ${{ secrets.AZ_TENANT_ID2 }} + subscription-id: ${{ secrets.AZ_SUBSCRIPTION_ID2 }} - name: Delete AKS cluster if: always() diff --git a/.github/workflows/run-kata-coco-tests.yaml b/.github/workflows/run-kata-coco-tests.yaml index f5ac68322b..07535fe4b0 100644 --- a/.github/workflows/run-kata-coco-tests.yaml +++ b/.github/workflows/run-kata-coco-tests.yaml @@ -35,11 +35,11 @@ on: secrets: AUTHENTICATED_IMAGE_PASSWORD: required: true - AZ_APPID: + AZ_APPID2: required: true - AZ_TENANT_ID: + AZ_TENANT_ID2: required: true - AZ_SUBSCRIPTION_ID: + AZ_SUBSCRIPTION_ID2: required: true concurrency: diff --git a/tests/cleanup_resources.py b/tests/cleanup_resources.py index 46d91c80c3..a090e612d1 100644 --- a/tests/cleanup_resources.py +++ b/tests/cleanup_resources.py @@ -21,7 +21,7 @@ print(f"Cleanup time delta: {cleanup_after}") print(f"Will clean up resources created before {cleanup_cutoff_time}") credential = AzureCliCredential() -subscription_id = os.environ['AZ_SUBSCRIPTION_ID'] +subscription_id = os.environ['AZ_SUBSCRIPTION_ID2'] client = ResourceManagementClient(credential, subscription_id) resources = client.resources.list(expand='createdTime')