Skip to content

ref(gcb): Refactor how we test Py3 #21329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 14, 2020
Merged

ref(gcb): Refactor how we test Py3 #21329

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22ece10
ref(gcb): Refactor how we test Py3
BYK Oct 14, 2020
127b890
Merge branch 'master' into byk/ref/py3-gcb-tests
BYK Oct 14, 2020
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
46 changes: 22 additions & 24 deletions docker/cloudbuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ steps:
timeout: 180s
- name: 'us.gcr.io/$PROJECT_ID/sentry-builder:$COMMIT_SHA'
id: builder-run
env: [
'SOURCE_COMMIT=$COMMIT_SHA'
]
env:
- 'SOURCE_COMMIT=$COMMIT_SHA'
timeout: 360s
- name: 'gcr.io/kaniko-project/executor:v0.22.0'
id: runtime-image-py2
Expand Down Expand Up @@ -42,10 +41,6 @@ steps:
waitFor:
- runtime-image-py2
entrypoint: 'bash'
env:
- 'SENTRY_IMAGE=us.gcr.io/$PROJECT_ID/sentry:$COMMIT_SHA'
- 'SENTRY_TEST_HOST=http://nginx'
- 'CI=1'
args:
- '-e'
- '-c'
Expand All @@ -72,9 +67,7 @@ steps:
- e2e-test-py2
entrypoint: 'bash'
env:
- 'SENTRY_IMAGE=us.gcr.io/$PROJECT_ID/sentry:$COMMIT_SHA-py3'
- 'SENTRY_TEST_HOST=http://nginx'
- 'CI=1'
- 'SENTRY_PYTHON3=1'
args:
- '-e'
- '-c'
Expand All @@ -98,14 +91,14 @@ steps:
# Only push to Docker Hub from master
[ "$BRANCH_NAME" != "master" ] && exit 0
# Need to pull the image first due to Kaniko
docker pull us.gcr.io/$PROJECT_ID/sentry:$COMMIT_SHA
docker pull $SENTRY_IMAGE
echo "$$DOCKER_PASSWORD" | docker login --username=sentrybuilder --password-stdin
docker tag us.gcr.io/$PROJECT_ID/sentry:$COMMIT_SHA getsentry/sentry:$SHORT_SHA
docker push getsentry/sentry:$SHORT_SHA
docker tag us.gcr.io/$PROJECT_ID/sentry:$COMMIT_SHA getsentry/sentry:$COMMIT_SHA
docker push getsentry/sentry:$COMMIT_SHA
docker tag us.gcr.io/$PROJECT_ID/sentry:$COMMIT_SHA getsentry/sentry:latest
docker push getsentry/sentry:latest
docker $SENTRY_IMAGE $DOCKER_REPO:$SHORT_SHA
docker push $DOCKER_REPO:$SHORT_SHA
docker $SENTRY_IMAGE $DOCKER_REPO:$COMMIT_SHA
docker push $DOCKER_REPO:$COMMIT_SHA
docker $SENTRY_IMAGE $DOCKER_REPO:latest
docker push $DOCKER_REPO:latest
- name: 'gcr.io/cloud-builders/docker'
id: docker-push-py3
waitFor:
Expand All @@ -119,14 +112,14 @@ steps:
# Only push to Docker Hub from master
[ "$BRANCH_NAME" != "master" ] && exit 0
# Need to pull the image first due to Kaniko
docker pull us.gcr.io/$PROJECT_ID/sentry:$COMMIT_SHA-py3
docker pull $SENTRY_IMAGE-py3
echo "$$DOCKER_PASSWORD" | docker login --username=sentrybuilder --password-stdin
docker tag us.gcr.io/$PROJECT_ID/sentry:$COMMIT_SHA-py3 getsentry/sentry:$SHORT_SHA-py3
docker push getsentry/sentry:$SHORT_SHA-py3
docker tag us.gcr.io/$PROJECT_ID/sentry:$COMMIT_SHA-py3 getsentry/sentry:$COMMIT_SHA-py3
docker push getsentry/sentry:$COMMIT_SHA-py3
docker tag us.gcr.io/$PROJECT_ID/sentry:$COMMIT_SHA-py3 getsentry/sentry:latest-py3
docker push getsentry/sentry:latest-py3
docker $SENTRY_IMAGE-py3 $DOCKER_REPO:$SHORT_SHA-py3
docker push $DOCKER_REPO:$SHORT_SHA-py3
docker $SENTRY_IMAGE-py3 $DOCKER_REPO:$COMMIT_SHA-py3
docker push $DOCKER_REPO:$COMMIT_SHA-py3
docker $SENTRY_IMAGE-py3 $DOCKER_REPO:latest-py3
docker push $DOCKER_REPO:latest-py3
- name: 'node:12'
id: zeus-upload
waitFor:
Expand All @@ -145,6 +138,11 @@ timeout: 2400s
options:
# We need more memory for Webpack builds & e2e onpremise tests
machineType: 'N1_HIGHCPU_8'
env:
- 'SENTRY_IMAGE=us.gcr.io/$PROJECT_ID/sentry:$COMMIT_SHA'
- 'DOCKER_REPO=getsentry/sentry'
- 'SENTRY_TEST_HOST=http://nginx'
- 'CI=1'
secrets:
- kmsKeyName: projects/sentryio/locations/global/keyRings/service-credentials/cryptoKeys/cloudbuild
secretEnv:
Expand Down