Merge pull request #2766 from buildkite/plt-2360-fix-oidc-role-name

Plt 2360 fix OIDC role name
buildkite · May 6, 2024 · 78d3217 · 78d3217
2 parents 98c49fc + 70215f4
commit 78d3217
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 10 deletions.
diff --git a/.buildkite/pipeline.release-stable.yml b/.buildkite/pipeline.release-stable.yml
@@ -36,6 +36,10 @@ steps:
           login: true
           account-ids: "032379705303"
       - docker#v5.8.0:
+          environment:
+            - "AWS_ACCESS_KEY_ID"
+            - "AWS_SECRET_ACCESS_KEY"
+            - "AWS_SESSION_TOKEN"
           image: "032379705303.dkr.ecr.us-east-1.amazonaws.com/deploytools:2022.07"
           propagate-environment: true
           mount-buildkite-agent: true
@@ -73,6 +77,10 @@ steps:
       - aws-assume-role-with-web-identity:
           role-arn: arn:aws:iam::032379705303:role/pipeline-buildkite-agent-release-stable
       - docker#v5.8.0:
+          environment:
+            - "AWS_ACCESS_KEY_ID"
+            - "AWS_SECRET_ACCESS_KEY"
+            - "AWS_SESSION_TOKEN"
           image: "public.ecr.aws/docker/library/ruby:3.0"
           entrypoint: bash
           propagate-environment: true
@@ -110,6 +118,10 @@ steps:
       - aws-assume-role-with-web-identity:
           role-arn: arn:aws:iam::032379705303:role/pipeline-buildkite-agent-release-stable
       - docker#v5.8.0:
+          environment:
+            - "AWS_ACCESS_KEY_ID"
+            - "AWS_SECRET_ACCESS_KEY"
+            - "AWS_SESSION_TOKEN"
           image: "public.ecr.aws/docker/library/ruby:3.0"
           entrypoint: bash
           propagate-environment: true
@@ -141,6 +153,10 @@ steps:
           login: true
           account-ids: "032379705303"
       - docker#v5.8.0:
+          environment:
+            - "AWS_ACCESS_KEY_ID"
+            - "AWS_SECRET_ACCESS_KEY"
+            - "AWS_SESSION_TOKEN"
           image: "032379705303.dkr.ecr.us-east-1.amazonaws.com/deploytools:2022.07"
           propagate-environment: true
           mount-buildkite-agent: true
diff --git a/.buildkite/pipeline.release-unstable.yml b/.buildkite/pipeline.release-unstable.yml
@@ -12,7 +12,7 @@ steps:
       CODENAME: "unstable"
     plugins:
       - aws-assume-role-with-web-identity:
-          role-arn: arn:aws:iam::032379705303:role/pipeline-buildkite-agent-release-unstable
+          role-arn: arn:aws:iam::032379705303:role/pipeline-buildkite-agent-release-beta
       - ecr#v2.7.0:
           login: true
           account-ids: "032379705303"
@@ -31,11 +31,15 @@ steps:
       CODENAME: "unstable"
     plugins:
       - aws-assume-role-with-web-identity:
-          role-arn: arn:aws:iam::032379705303:role/pipeline-buildkite-agent-release-unstable
+          role-arn: arn:aws:iam::032379705303:role/pipeline-buildkite-agent-release-beta
       - ecr#v2.7.0:
           login: true
           account-ids: "032379705303"
       - docker#v5.8.0:
+          environment:
+            - "AWS_ACCESS_KEY_ID"
+            - "AWS_SECRET_ACCESS_KEY"
+            - "AWS_SESSION_TOKEN"
           image: "032379705303.dkr.ecr.us-east-1.amazonaws.com/deploytools:2022.07"
           propagate-environment: true
           mount-buildkite-agent: true
@@ -47,7 +51,7 @@ steps:
       RPM_S3_BUCKET: "yum.buildkite.com"
     plugins:
       - aws-assume-role-with-web-identity:
-          role-arn: arn:aws:iam::032379705303:role/pipeline-buildkite-agent-release-unstable
+          role-arn: arn:aws:iam::032379705303:role/pipeline-buildkite-agent-release-beta
       - docker#v5.8.0:
           environment:
             - "AWS_ACCESS_KEY_ID"
@@ -71,8 +75,12 @@ steps:
       DISTRO_VERSION: rpm_any/rpm_any
     plugins:
       - aws-assume-role-with-web-identity:
-          role-arn: arn:aws:iam::032379705303:role/pipeline-buildkite-agent-release-unstable
+          role-arn: arn:aws:iam::032379705303:role/pipeline-buildkite-agent-release-beta
       - docker#v5.8.0:
+          environment:
+            - "AWS_ACCESS_KEY_ID"
+            - "AWS_SECRET_ACCESS_KEY"
+            - "AWS_SESSION_TOKEN"
           image: "public.ecr.aws/docker/library/ruby:3.0"
           entrypoint: bash
           propagate-environment: true
@@ -84,11 +92,9 @@ steps:
     env:
       CODENAME: "unstable"
       DEB_S3_BUCKET: "apt.buildkite.com/buildkite-agent"
-    agents:
-      queue: "deploy"
     plugins:
       - aws-assume-role-with-web-identity:
-          role-arn: arn:aws:iam::032379705303:role/pipeline-buildkite-agent-release-unstable
+          role-arn: arn:aws:iam::032379705303:role/pipeline-buildkite-agent-release-beta
       - ecr#v2.7.0:
           login: true
           account-ids: "032379705303"
@@ -110,7 +116,7 @@ steps:
       DISTRO_VERSION: any/any
     plugins:
       - aws-assume-role-with-web-identity:
-          role-arn: arn:aws:iam::032379705303:role/pipeline-buildkite-agent-release-unstable
+          role-arn: arn:aws:iam::032379705303:role/pipeline-buildkite-agent-release-beta
       - docker#v5.8.0:
           image: "public.ecr.aws/docker/library/ruby:3.0"
           entrypoint: bash
@@ -124,7 +130,7 @@ steps:
       CODENAME: "unstable"
     plugins:
       - aws-assume-role-with-web-identity:
-          role-arn: arn:aws:iam::032379705303:role/pipeline-buildkite-agent-release-unstable
+          role-arn: arn:aws:iam::032379705303:role/pipeline-buildkite-agent-release-beta
       - ecr#v2.7.0:
           login: true
           account-ids: "445615400570"
@@ -138,11 +144,15 @@ steps:
       CODENAME: "unstable"
     plugins:
       - aws-assume-role-with-web-identity:
-          role-arn: arn:aws:iam::032379705303:role/pipeline-buildkite-agent-release-unstable
+          role-arn: arn:aws:iam::032379705303:role/pipeline-buildkite-agent-release-beta
       - ecr#v2.7.0:
           login: true
           account-ids: "032379705303"
       - docker#v5.8.0:
+          environment:
+            - "AWS_ACCESS_KEY_ID"
+            - "AWS_SECRET_ACCESS_KEY"
+            - "AWS_SESSION_TOKEN"
           image: "032379705303.dkr.ecr.us-east-1.amazonaws.com/deploytools:2022.07"
           propagate-environment: true
           mount-buildkite-agent: true