From 62360f190cf5fbe208ce686b7860df027488a9f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Pereira?= <jpereira@gitlab.com>
Date: Mon, 12 Feb 2024 18:01:42 +0000
Subject: [PATCH 01/17] Update file .gitlab-ci.yml

---
 .gitlab-ci.yml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e223ab4..2ed822c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -146,3 +146,22 @@ gprd-nightly:
   needs: []
   rules:
     - if: $CI_PIPELINE_SOURCE == "schedule" && $E2E_NIGHTLY_RUN == "true"
+
+e2e-gstg:
+  image: gcr.io/google.com/cloudsdktool/google-cloud-cli:alpine
+  stage: e2e
+  needs: []
+  services:
+    - name: registry.gitlab.com/gitlab-org/architecture/gitlab-gcp-integration/glgo-token-service:v0.2.0
+      alias: sts
+  id_tokens:
+    GITLAB_WLIF_TOKEN:
+      aud: $WIF_PROVIDER_RESOURCE_NAME
+  variables:
+    GITLAB_WLIF_ENDPOINT: "https://glgo.example.com"
+    GITLAB_WLIF_TOKEN_FILE: "${CI_PROJECT_DIR}.tmp/GITLAB_WLIF_TOKEN"
+  script:
+    - gcloud config set project $GOOGLE_CLOUD_PROJECT_ID
+    - echo "${GITLAB_WLIF_TOKEN}" > "${GITLAB_WLIF_TOKEN_FILE}"
+    - gcloud auth login --cred-file=./config.json
+    - gcloud compute zones list --limit 1
-- 
GitLab


From 9aab21e90ec4501c09ba534b04c71cffa9386bca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Pereira?= <jpereira@gitlab.com>
Date: Mon, 12 Feb 2024 18:04:39 +0000
Subject: [PATCH 02/17] Update file .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2ed822c..0577a47 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -158,7 +158,7 @@ e2e-gstg:
     GITLAB_WLIF_TOKEN:
       aud: $WIF_PROVIDER_RESOURCE_NAME
   variables:
-    GITLAB_WLIF_ENDPOINT: "https://glgo.example.com"
+    GITLAB_WLIF_ENDPOINT: https://glgo.staging.runway.gitlab.net
     GITLAB_WLIF_TOKEN_FILE: "${CI_PROJECT_DIR}.tmp/GITLAB_WLIF_TOKEN"
   script:
     - gcloud config set project $GOOGLE_CLOUD_PROJECT_ID
-- 
GitLab


From bea9892cf36a66909156586550016f679e977bdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Pereira?= <jpereira@gitlab.com>
Date: Mon, 12 Feb 2024 18:07:24 +0000
Subject: [PATCH 03/17] Update file .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0577a47..a61e130 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -152,7 +152,7 @@ e2e-gstg:
   stage: e2e
   needs: []
   services:
-    - name: registry.gitlab.com/gitlab-org/architecture/gitlab-gcp-integration/glgo-token-service:v0.2.0
+    - name: registry.gitlab.com/gitlab-org/architecture/gitlab-gcp-integration/glgo/glgo-token-service:v0.2.0
       alias: sts
   id_tokens:
     GITLAB_WLIF_TOKEN:
-- 
GitLab


From d133b4b1aea9f9a7975d44a47252bc36f90bd712 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Pereira?= <jpereira@gitlab.com>
Date: Mon, 12 Feb 2024 18:10:02 +0000
Subject: [PATCH 04/17] Update file .gitlab-ci.yml

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a61e130..e354ec5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -147,7 +147,7 @@ gprd-nightly:
   rules:
     - if: $CI_PIPELINE_SOURCE == "schedule" && $E2E_NIGHTLY_RUN == "true"
 
-e2e-gstg:
+gstg-post-deploy:
   image: gcr.io/google.com/cloudsdktool/google-cloud-cli:alpine
   stage: e2e
   needs: []
@@ -156,7 +156,7 @@ e2e-gstg:
       alias: sts
   id_tokens:
     GITLAB_WLIF_TOKEN:
-      aud: $WIF_PROVIDER_RESOURCE_NAME
+      aud: //iam.googleapis.com/projects/dev-gcp-s3c-integrati-9abafed1/locations/global/workloadIdentityPools/glgo-e2e-ci-testing/providers/gstg
   variables:
     GITLAB_WLIF_ENDPOINT: https://glgo.staging.runway.gitlab.net
     GITLAB_WLIF_TOKEN_FILE: "${CI_PROJECT_DIR}.tmp/GITLAB_WLIF_TOKEN"
-- 
GitLab


From 0991e9a6f18243e15f1ef266988816bd58f3966e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Pereira?= <jpereira@gitlab.com>
Date: Mon, 12 Feb 2024 18:12:01 +0000
Subject: [PATCH 05/17] Update file .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e354ec5..6e68afd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -156,7 +156,7 @@ gstg-post-deploy:
       alias: sts
   id_tokens:
     GITLAB_WLIF_TOKEN:
-      aud: //iam.googleapis.com/projects/dev-gcp-s3c-integrati-9abafed1/locations/global/workloadIdentityPools/glgo-e2e-ci-testing/providers/gstg
+      aud: //iam.googleapis.com/projects/604150606412/locations/global/workloadIdentityPools/glgo-e2e-ci-testing/providers/gstg
   variables:
     GITLAB_WLIF_ENDPOINT: https://glgo.staging.runway.gitlab.net
     GITLAB_WLIF_TOKEN_FILE: "${CI_PROJECT_DIR}.tmp/GITLAB_WLIF_TOKEN"
-- 
GitLab


From 361d56e2cf53b66aa6ea5c5c8d9ac8fa5d4b378d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Pereira?= <jpereira@gitlab.com>
Date: Mon, 12 Feb 2024 18:18:20 +0000
Subject: [PATCH 06/17] Update file .gitlab-ci.yml

---
 .gitlab-ci.yml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6e68afd..79b95cf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -156,12 +156,24 @@ gstg-post-deploy:
       alias: sts
   id_tokens:
     GITLAB_WLIF_TOKEN:
-      aud: //iam.googleapis.com/projects/604150606412/locations/global/workloadIdentityPools/glgo-e2e-ci-testing/providers/gstg
+      aud: $WIF_PROVIDER_RESOURCE_NAME
   variables:
     GITLAB_WLIF_ENDPOINT: https://glgo.staging.runway.gitlab.net
     GITLAB_WLIF_TOKEN_FILE: "${CI_PROJECT_DIR}.tmp/GITLAB_WLIF_TOKEN"
+  before_script:
+    - TMPDIR=$(mktemp -d)
+    - |
+      echo '{
+        "type": "external_account",
+        "audience": "$[[ inputs.gcp_wif_audience ]]",
+        "subject_token_type": "urn:ietf:params:oauth:token-type:id_token",
+        "token_url": "https://sts.googleapis.com/v1/token",
+        "credential_source": {
+          "url": "http://sts:8083/"
+        }
+      }' > $TMPDIR/config.json
+    - echo "${GITLAB_WLIF_TOKEN}" > "${GITLAB_WLIF_TOKEN_FILE}"
+    - gcloud auth login --cred-file=$TMPDIR/config.json
   script:
     - gcloud config set project $GOOGLE_CLOUD_PROJECT_ID
-    - echo "${GITLAB_WLIF_TOKEN}" > "${GITLAB_WLIF_TOKEN_FILE}"
-    - gcloud auth login --cred-file=./config.json
     - gcloud compute zones list --limit 1
-- 
GitLab


From 0d7b6f3450a0df34acdefd987f2b4b96323bfd08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Pereira?= <jpereira@gitlab.com>
Date: Mon, 12 Feb 2024 18:21:16 +0000
Subject: [PATCH 07/17] Update file .gitlab-ci.yml

---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 79b95cf..588d1d6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -165,13 +165,14 @@ gstg-post-deploy:
     - |
       echo '{
         "type": "external_account",
-        "audience": "$[[ inputs.gcp_wif_audience ]]",
+        "audience": "$WIF_PROVIDER_RESOURCE_NAME",
         "subject_token_type": "urn:ietf:params:oauth:token-type:id_token",
         "token_url": "https://sts.googleapis.com/v1/token",
         "credential_source": {
           "url": "http://sts:8083/"
         }
       }' > $TMPDIR/config.json
+    - cat $TMPDIR/config.json
     - echo "${GITLAB_WLIF_TOKEN}" > "${GITLAB_WLIF_TOKEN_FILE}"
     - gcloud auth login --cred-file=$TMPDIR/config.json
   script:
-- 
GitLab


From 9ab46fb6e9d36704ca15352ad4d664e050331e42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Pereira?= <jpereira@gitlab.com>
Date: Mon, 12 Feb 2024 18:24:14 +0000
Subject: [PATCH 08/17] Update file .gitlab-ci.yml

---
 .gitlab-ci.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 588d1d6..6694357 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -156,7 +156,7 @@ gstg-post-deploy:
       alias: sts
   id_tokens:
     GITLAB_WLIF_TOKEN:
-      aud: $WIF_PROVIDER_RESOURCE_NAME
+      aud: $E2E_WIF_PROVIDER_RESOURCE_NAME
   variables:
     GITLAB_WLIF_ENDPOINT: https://glgo.staging.runway.gitlab.net
     GITLAB_WLIF_TOKEN_FILE: "${CI_PROJECT_DIR}.tmp/GITLAB_WLIF_TOKEN"
@@ -165,13 +165,14 @@ gstg-post-deploy:
     - |
       echo '{
         "type": "external_account",
-        "audience": "$WIF_PROVIDER_RESOURCE_NAME",
+        "audience": "E2E_WIF_PROVIDER_RESOURCE_NAME",
         "subject_token_type": "urn:ietf:params:oauth:token-type:id_token",
         "token_url": "https://sts.googleapis.com/v1/token",
         "credential_source": {
           "url": "http://sts:8083/"
         }
       }' > $TMPDIR/config.json
+    - sed -i "s/E2E_WIF_PROVIDER_RESOURCE_NAME/$E2E_WIF_PROVIDER_RESOURCE_NAME/g" $TMPDIR/config.json
     - cat $TMPDIR/config.json
     - echo "${GITLAB_WLIF_TOKEN}" > "${GITLAB_WLIF_TOKEN_FILE}"
     - gcloud auth login --cred-file=$TMPDIR/config.json
-- 
GitLab


From a9adaeceb16b32a3fa5910d73a83d0744aff8feb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Pereira?= <jpereira@gitlab.com>
Date: Mon, 12 Feb 2024 18:25:56 +0000
Subject: [PATCH 09/17] Update file .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6694357..300720e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -172,7 +172,7 @@ gstg-post-deploy:
           "url": "http://sts:8083/"
         }
       }' > $TMPDIR/config.json
-    - sed -i "s/E2E_WIF_PROVIDER_RESOURCE_NAME/$E2E_WIF_PROVIDER_RESOURCE_NAME/g" $TMPDIR/config.json
+    - sed -i "s/E2E_WIF_PROVIDER_RESOURCE_NAME/'"$E2E_WIF_PROVIDER_RESOURCE_NAME"'/g" $TMPDIR/config.json
     - cat $TMPDIR/config.json
     - echo "${GITLAB_WLIF_TOKEN}" > "${GITLAB_WLIF_TOKEN_FILE}"
     - gcloud auth login --cred-file=$TMPDIR/config.json
-- 
GitLab


From 36ab6440422712ce11752f9e2c2adf1e236ff2f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Pereira?= <jpereira@gitlab.com>
Date: Mon, 12 Feb 2024 18:28:12 +0000
Subject: [PATCH 10/17] Update file .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 300720e..16be93b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -172,7 +172,7 @@ gstg-post-deploy:
           "url": "http://sts:8083/"
         }
       }' > $TMPDIR/config.json
-    - sed -i "s/E2E_WIF_PROVIDER_RESOURCE_NAME/'"$E2E_WIF_PROVIDER_RESOURCE_NAME"'/g" $TMPDIR/config.json
+    - sed -i "s|E2E_WIF_PROVIDER_RESOURCE_NAME|${E2E_WIF_PROVIDER_RESOURCE_NAME}|g" $TMPDIR/config.json
     - cat $TMPDIR/config.json
     - echo "${GITLAB_WLIF_TOKEN}" > "${GITLAB_WLIF_TOKEN_FILE}"
     - gcloud auth login --cred-file=$TMPDIR/config.json
-- 
GitLab


From 3a51e94722e03c03d4a6c638bd7bb653a7108b33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Pereira?= <jpereira@gitlab.com>
Date: Mon, 12 Feb 2024 18:30:00 +0000
Subject: [PATCH 11/17] Update file .gitlab-ci.yml

---
 .gitlab-ci.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 16be93b..4530014 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -156,7 +156,7 @@ gstg-post-deploy:
       alias: sts
   id_tokens:
     GITLAB_WLIF_TOKEN:
-      aud: $E2E_WIF_PROVIDER_RESOURCE_NAME
+      aud: //iam.googleapis.com/projects/604150606412/locations/global/workloadIdentityPools/glgo-e2e-ci-testing/providers/gstg
   variables:
     GITLAB_WLIF_ENDPOINT: https://glgo.staging.runway.gitlab.net
     GITLAB_WLIF_TOKEN_FILE: "${CI_PROJECT_DIR}.tmp/GITLAB_WLIF_TOKEN"
@@ -165,14 +165,13 @@ gstg-post-deploy:
     - |
       echo '{
         "type": "external_account",
-        "audience": "E2E_WIF_PROVIDER_RESOURCE_NAME",
+        "audience": "//iam.googleapis.com/projects/604150606412/locations/global/workloadIdentityPools/glgo-e2e-ci-testing/providers/gstg",
         "subject_token_type": "urn:ietf:params:oauth:token-type:id_token",
         "token_url": "https://sts.googleapis.com/v1/token",
         "credential_source": {
           "url": "http://sts:8083/"
         }
       }' > $TMPDIR/config.json
-    - sed -i "s|E2E_WIF_PROVIDER_RESOURCE_NAME|${E2E_WIF_PROVIDER_RESOURCE_NAME}|g" $TMPDIR/config.json
     - cat $TMPDIR/config.json
     - echo "${GITLAB_WLIF_TOKEN}" > "${GITLAB_WLIF_TOKEN_FILE}"
     - gcloud auth login --cred-file=$TMPDIR/config.json
-- 
GitLab


From 2d3d1d2528ed64f27e4250ba726c8a3ae994c05f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Pereira?= <jpereira@gitlab.com>
Date: Mon, 12 Feb 2024 20:37:50 +0000
Subject: [PATCH 12/17] Update file .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4530014..4f27605 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -154,12 +154,14 @@ gstg-post-deploy:
   services:
     - name: registry.gitlab.com/gitlab-org/architecture/gitlab-gcp-integration/glgo/glgo-token-service:v0.2.0
       alias: sts
+    - docker:24.0.6-dind
   id_tokens:
     GITLAB_WLIF_TOKEN:
       aud: //iam.googleapis.com/projects/604150606412/locations/global/workloadIdentityPools/glgo-e2e-ci-testing/providers/gstg
   variables:
     GITLAB_WLIF_ENDPOINT: https://glgo.staging.runway.gitlab.net
     GITLAB_WLIF_TOKEN_FILE: "${CI_PROJECT_DIR}.tmp/GITLAB_WLIF_TOKEN"
+    DOCKER_HOST: "tcp://docker:2375"
   before_script:
     - TMPDIR=$(mktemp -d)
     - |
-- 
GitLab


From d2a9ded79c1382bafb8cef6c6bfe27e4d5e1f0cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Pereira?= <jpereira@gitlab.com>
Date: Mon, 12 Feb 2024 20:53:32 +0000
Subject: [PATCH 13/17] Update file .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4f27605..87360a1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -157,7 +157,7 @@ gstg-post-deploy:
     - docker:24.0.6-dind
   id_tokens:
     GITLAB_WLIF_TOKEN:
-      aud: //iam.googleapis.com/projects/604150606412/locations/global/workloadIdentityPools/glgo-e2e-ci-testing/providers/gstg
+      aud: https://glgo.staging.runway.gitlab.net
   variables:
     GITLAB_WLIF_ENDPOINT: https://glgo.staging.runway.gitlab.net
     GITLAB_WLIF_TOKEN_FILE: "${CI_PROJECT_DIR}.tmp/GITLAB_WLIF_TOKEN"
-- 
GitLab


From b8f8c23b381670c142fb3119fd2865caa28477f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Pereira?= <jpereira@gitlab.com>
Date: Tue, 13 Feb 2024 10:48:51 +0000
Subject: [PATCH 14/17] Update file .gitlab-ci.yml

---
 .gitlab-ci.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 87360a1..9a436a7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -154,20 +154,18 @@ gstg-post-deploy:
   services:
     - name: registry.gitlab.com/gitlab-org/architecture/gitlab-gcp-integration/glgo/glgo-token-service:v0.2.0
       alias: sts
-    - docker:24.0.6-dind
   id_tokens:
     GITLAB_WLIF_TOKEN:
       aud: https://glgo.staging.runway.gitlab.net
   variables:
     GITLAB_WLIF_ENDPOINT: https://glgo.staging.runway.gitlab.net
     GITLAB_WLIF_TOKEN_FILE: "${CI_PROJECT_DIR}.tmp/GITLAB_WLIF_TOKEN"
-    DOCKER_HOST: "tcp://docker:2375"
   before_script:
     - TMPDIR=$(mktemp -d)
     - |
       echo '{
         "type": "external_account",
-        "audience": "//iam.googleapis.com/projects/604150606412/locations/global/workloadIdentityPools/glgo-e2e-ci-testing/providers/gstg",
+        "audience": "${E2E_WIF_PROVIDER_RESOURCE_NAME}",
         "subject_token_type": "urn:ietf:params:oauth:token-type:id_token",
         "token_url": "https://sts.googleapis.com/v1/token",
         "credential_source": {
-- 
GitLab


From cf1cfe7b552c7c7a87292d57fe41a87090c6a9c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Pereira?= <jpereira@gitlab.com>
Date: Tue, 13 Feb 2024 10:50:18 +0000
Subject: [PATCH 15/17] Update file .gitlab-ci.yml

---
 .gitlab-ci.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9a436a7..767caab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,8 +33,9 @@ stages:
   - test
   - release
   - runway_staging
+  - e2e-gstg
   - runway_production
-  - e2e
+  - e2e-gprd
 
 .scanners: &scanners
   stage: verify
@@ -128,7 +129,7 @@ publish-image:
 # End-to-end test with a WIF pool that is set up to use the glgo production instance as OIDC provider.
 .e2e-gprd:
   image: gcr.io/google.com/cloudsdktool/google-cloud-cli:alpine
-  stage: e2e
+  stage: e2e-gprd
   identity: google_cloud
   script:
     - gcloud config set project $GOOGLE_CLOUD_PROJECT_ID
@@ -149,8 +150,8 @@ gprd-nightly:
 
 gstg-post-deploy:
   image: gcr.io/google.com/cloudsdktool/google-cloud-cli:alpine
-  stage: e2e
-  needs: []
+  stage: e2e-gstg
+  needs: [] # TODO: remove before merge
   services:
     - name: registry.gitlab.com/gitlab-org/architecture/gitlab-gcp-integration/glgo/glgo-token-service:v0.2.0
       alias: sts
-- 
GitLab


From 180289f38b96bcd525595e7e25d05edc40234dcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Pereira?= <jpereira@gitlab.com>
Date: Tue, 13 Feb 2024 10:52:26 +0000
Subject: [PATCH 16/17] Update file .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 767caab..e5b5c6e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -166,7 +166,7 @@ gstg-post-deploy:
     - |
       echo '{
         "type": "external_account",
-        "audience": "${E2E_WIF_PROVIDER_RESOURCE_NAME}",
+        "audience": "//iam.googleapis.com/projects/604150606412/locations/global/workloadIdentityPools/glgo-e2e-ci-testing/providers/gstg",
         "subject_token_type": "urn:ietf:params:oauth:token-type:id_token",
         "token_url": "https://sts.googleapis.com/v1/token",
         "credential_source": {
-- 
GitLab


From 64d0248c22baf2fbf87d2a7751da8cce8718c417 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Pereira?= <jpereira@gitlab.com>
Date: Tue, 13 Feb 2024 13:26:21 +0000
Subject: [PATCH 17/17] Update file .gitlab-ci.yml

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e5b5c6e..be177c1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -155,6 +155,7 @@ gstg-post-deploy:
   services:
     - name: registry.gitlab.com/gitlab-org/architecture/gitlab-gcp-integration/glgo/glgo-token-service:v0.2.0
       alias: sts
+  identity: google_cloud
   id_tokens:
     GITLAB_WLIF_TOKEN:
       aud: https://glgo.staging.runway.gitlab.net
-- 
GitLab