Skip to content

ci(gcb): Fix GCB failures due to missing var expansion #21360

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 5 commits into from
Oct 15, 2020
Merged

ci(gcb): Fix GCB failures due to missing var expansion #21360

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
90cf43f
ci(gcb): Fix GCB failures due to missing var expansion
BYK Oct 15, 2020
1d3f9bf
catch errors from py3 tests too
BYK Oct 15, 2020
55b8344
fix docker pushes
BYK Oct 15, 2020
63e689b
only download onprem repo once
BYK Oct 15, 2020
211d2fb
fix e2e test dir
BYK Oct 15, 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
40 changes: 32 additions & 8 deletions docker/cloudbuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,8 @@ steps:
]
timeout: 300s
- name: 'gcr.io/$PROJECT_ID/docker-compose'
id: e2e-test-py2
waitFor:
- runtime-image-py2
id: get-onpremise-repo
waitFor: ['-']
entrypoint: 'bash'
args:
- '-e'
Expand All @@ -48,6 +47,19 @@ steps:
mkdir onpremise && cd onpremise
curl -L "https://github.com/getsentry/onpremise/archive/master.tar.gz" | tar xzf - --strip-components=1
echo '{"version": "3.4", "networks":{"default":{"external":{"name":"cloudbuild"}}}}' > docker-compose.override.yml
- name: 'gcr.io/$PROJECT_ID/docker-compose'
id: e2e-test-py2
waitFor:
- runtime-image-py2
- get-onpremise-repo
entrypoint: 'bash'
dir: onpremise
env:
- 'SENTRY_IMAGE=us.gcr.io/$PROJECT_ID/sentry:$COMMIT_SHA'
args:
- '-e'
- '-c'
- |
./install.sh
set +e
./test.sh
Expand All @@ -64,26 +76,37 @@ steps:
id: e2e-test-py3
waitFor:
- runtime-image-py3
- get-onpremise-repo
- e2e-test-py2
entrypoint: 'bash'
dir: onpremise
env:
- 'SENTRY_IMAGE=us.gcr.io/$PROJECT_ID/sentry:$COMMIT_SHA'
- 'SENTRY_PYTHON3=1'
args:
- '-e'
- '-c'
- |
mkdir onpremise && cd onpremise
curl -L "https://github.com/getsentry/onpremise/archive/master.tar.gz" | tar xzf - --strip-components=1
echo '{"version": "3.4", "networks":{"default":{"external":{"name":"cloudbuild"}}}}' > docker-compose.override.yml
./install.sh
./test.sh || docker-compose logs nginx web relay
set +e
./test.sh
test_return=$?
set -e
if [[ $test_return -ne 0 ]]; then
echo "Test failed.";
docker-compose ps;
docker-compose logs nginx web relay;
exit $test_return;
fi
timeout: 450s
- name: 'gcr.io/cloud-builders/docker'
id: docker-push
waitFor:
- e2e-test-py2
secretEnv: ['DOCKER_PASSWORD']
entrypoint: 'bash'
env:
- 'SENTRY_IMAGE=us.gcr.io/$PROJECT_ID/sentry:$COMMIT_SHA'
args:
- '-e'
- '-c'
Expand All @@ -105,6 +128,8 @@ steps:
- e2e-test-py3
secretEnv: ['DOCKER_PASSWORD']
entrypoint: 'bash'
env:
- 'SENTRY_IMAGE=us.gcr.io/$PROJECT_ID/sentry:$COMMIT_SHA'
args:
- '-e'
- '-c'
Expand Down Expand Up @@ -139,7 +164,6 @@ 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'
Expand Down