ci: switch azure creds

Signed-off-by: Aurélien Bombo <abombo@microsoft.com>
This commit is contained in:
Aurélien Bombo
2026-06-30 09:21:33 -05:00
parent 8635c59e07
commit 876310854d
8 changed files with 35 additions and 35 deletions

View File

@@ -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 }}

View File

@@ -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 }}

View File

@@ -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 }}

View File

@@ -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' }}

View File

@@ -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

View File

@@ -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()

View File

@@ -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:

View File

@@ -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')