Merge branch 'main' into 'main'

Fix oidc.md - Replace AWS with GCP on Line 34

See merge request gitlab-com/gl-infra/common-ci-tasks!865

oidc.md

@@ -31,7 +31,7 @@ deploy_to_cloud_provider:
 ### Using GCP OIDC
-Full instructions on setting up AWS OIDC are available in the [GitLab Docs](https://docs.gitlab.com/ee/ci/cloud_services/google_cloud/). Setup an appropriate OIDC provider for `gitlab.com` or `ops.gitlab.net`.
+Full instructions on setting up GCP OIDC are available in the [GitLab Docs](https://docs.gitlab.com/ee/ci/cloud_services/google_cloud/). Setup an appropriate OIDC provider for `gitlab.com` or `ops.gitlab.net`.
 Three variables are required for the job to work: