Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,6 @@ jobs:
google_ar: true
tag_nightly: false
tag_latest: true
# TODO: remove this once we cut over GoCD to using gha for prod images
tag_suffix: -gha
google_ar_image_name: us-central1-docker.pkg.dev/sentryio/vroom/vroom
google_workload_identity_provider: projects/868781662168/locations/global/workloadIdentityPools/prod-github/providers/github-oidc-pool
google_service_account: gha-gcr-push@sac-prod-sa.iam.gserviceaccount.com
14 changes: 1 addition & 13 deletions cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,6 @@ steps:
- name: 'gcr.io/cloud-builders/docker'
args: [
'build',
'-t', 'us-central1-docker.pkg.dev/sentryio/vroom/vroom:$COMMIT_SHA',
'-t', 'us-central1-docker.pkg.dev/sentryio/vroom/vroom:latest',
'--cache-from', 'us-central1-docker.pkg.dev/sentryio/vroom/vroom:latest',
'-t', 'us-central1-docker.pkg.dev/sentryio/vroom/vroom:$COMMIT_SHA-cloudbuild',
'.',
]
- name: 'gcr.io/cloud-builders/docker'
entrypoint: 'bash'
args:
- '-c'
- |
[ "$BRANCH_NAME" != "main" ] && exit 0
docker push us-central1-docker.pkg.dev/$PROJECT_ID/vroom/vroom:latest
images: [
'us-central1-docker.pkg.dev/sentryio/vroom/vroom:$COMMIT_SHA',
]
8 changes: 0 additions & 8 deletions gocd/templates/bash/check-cloudbuild.sh

This file was deleted.

3 changes: 2 additions & 1 deletion gocd/templates/bash/check-github.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
checks-githubactions-checkruns \
getsentry/vroom \
${GO_REVISION_VROOM_REPO} \
test-vroom
test-vroom \
'Build and push production images'
1 change: 0 additions & 1 deletion gocd/templates/pipelines/vroom.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ function(region) {
elastic_profile_id: 'vroom',
tasks: [
gocdtasks.script(importstr '../bash/check-github.sh'),
gocdtasks.script(importstr '../bash/check-cloudbuild.sh'),
],
},
},
Expand Down