From 8b860de54f34b0c262dddd0ee8d031312740879e Mon Sep 17 00:00:00 2001 From: David Cavazos Date: Mon, 12 May 2025 13:37:04 -0700 Subject: [PATCH 1/2] fix: rename service account env var --- .github/workflows/custard-run-dev.yaml | 4 ++-- .github/workflows/custard-run.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/custard-run-dev.yaml b/.github/workflows/custard-run-dev.yaml index 2f4a8dce47..cbb69376f6 100644 --- a/.github/workflows/custard-run-dev.yaml +++ b/.github/workflows/custard-run-dev.yaml @@ -70,7 +70,7 @@ jobs: continue-on-error: true env: GOOGLE_SAMPLES_PROJECT: long-door-651 - GOOGLE_SERVICE_ACCOUNT: kokoro-system-test@long-door-651.iam.gserviceaccount.com + SERVICE_ACCOUNT: kokoro-system-test@long-door-651.iam.gserviceaccount.com steps: - name: Check queued uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/create-check@9ee708234e240605d96e78f652c333ed6aa95a23 # v0.3.2 @@ -88,7 +88,7 @@ jobs: with: project_id: ${{ env.GOOGLE_SAMPLES_PROJECT }} workload_identity_provider: projects/1046198160504/locations/global/workloadIdentityPools/github-actions-pool/providers/github-actions-provider - service_account: ${{ env.GOOGLE_SERVICE_ACCOUNT }} + service_account: ${{ env.SERVICE_ACCOUNT }} access_token_lifetime: 600s # 10 minutes token_format: id_token id_token_audience: https://action.test/ # service must have this custom audience diff --git a/.github/workflows/custard-run.yaml b/.github/workflows/custard-run.yaml index 91b28a0c94..c22e444e9c 100644 --- a/.github/workflows/custard-run.yaml +++ b/.github/workflows/custard-run.yaml @@ -114,7 +114,7 @@ jobs: continue-on-error: true env: GOOGLE_SAMPLES_PROJECT: long-door-651 - GOOGLE_SERVICE_ACCOUNT: kokoro-system-test@long-door-651.iam.gserviceaccount.com + SERVICE_ACCOUNT: kokoro-system-test@long-door-651.iam.gserviceaccount.com steps: - name: Check queued uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/create-check@9ee708234e240605d96e78f652c333ed6aa95a23 # v0.3.2 @@ -132,7 +132,7 @@ jobs: with: project_id: ${{ env.GOOGLE_SAMPLES_PROJECT }} workload_identity_provider: projects/1046198160504/locations/global/workloadIdentityPools/github-actions-pool/providers/github-actions-provider - service_account: ${{ env.GOOGLE_SERVICE_ACCOUNT }} + service_account: ${{ env.SERVICE_ACCOUNT }} access_token_lifetime: 600s # 10 minutes token_format: id_token id_token_audience: https://action.test/ # service must have this custom audience From d54d5d74a15b15b01b2306cc586b03ed15a65069 Mon Sep 17 00:00:00 2001 From: David Cavazos Date: Mon, 12 May 2025 13:58:01 -0700 Subject: [PATCH 2/2] export SERVICE_ACCOUNT on the run step --- .github/workflows/custard-run-dev.yaml | 3 +++ .github/workflows/custard-run.yaml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/custard-run-dev.yaml b/.github/workflows/custard-run-dev.yaml index cbb69376f6..e5034e1512 100644 --- a/.github/workflows/custard-run-dev.yaml +++ b/.github/workflows/custard-run-dev.yaml @@ -109,6 +109,9 @@ jobs: run: | timeout ${{ fromJson(needs.affected.outputs.ci-setups)[matrix.path].timeout-minutes }}m \ make test dir=${{ matrix.path }} + env: + # TODO: remove this when the self-contained runner lands. + SERVICE_ACCOUNT: kokoro-system-test@long-door-651.iam.gserviceaccount.com - name: Check success uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/update-check@9ee708234e240605d96e78f652c333ed6aa95a23 # v0.3.2 with: diff --git a/.github/workflows/custard-run.yaml b/.github/workflows/custard-run.yaml index c22e444e9c..423d4828d6 100644 --- a/.github/workflows/custard-run.yaml +++ b/.github/workflows/custard-run.yaml @@ -153,6 +153,9 @@ jobs: run: | timeout ${{ fromJson(needs.affected.outputs.ci-setups)[matrix.path].timeout-minutes }}m \ make test dir=${{ matrix.path }} + env: + # TODO: remove this when the self-contained runner lands. + SERVICE_ACCOUNT: kokoro-system-test@long-door-651.iam.gserviceaccount.com - name: Check success uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/update-check@9ee708234e240605d96e78f652c333ed6aa95a23 # v0.3.2 with: