Integration test improvements #2858
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -59,13 +59,17 @@ jobs: | |
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| test_type: ["initial-install", "customizations"] | ||
| compose_version: ["v2.0.1", "v2.7.0"] | ||
| include: | ||
| - compose_version: "v2.0.1" | ||
| compose_path: "/usr/local/lib/docker/cli-plugins" | ||
| - compose_version: "v2.7.0" | ||
| compose_path: "/usr/local/lib/docker/cli-plugins" | ||
| env: | ||
| COMPOSE_PROJECT_NAME: self-hosted-${{ strategy.job-index }} | ||
| SENTRY_DSN: https://[email protected]/6627632 | ||
| REPORT_SELF_HOSTED_ISSUES: 1 | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v4 | ||
|
|
@@ -82,8 +86,11 @@ jobs: | |
| sudo curl -L https://github.com/docker/compose/releases/download/${{ matrix.compose_version }}/docker-compose-`uname -s`-`uname -m` -o "${{ matrix.compose_path }}/docker-compose" | ||
| sudo chmod +x "${{ matrix.compose_path }}/docker-compose" | ||
|
|
||
| - name: Install self-hosted | ||
| run: ./install.sh | ||
|
|
||
| - name: Integration Test | ||
| run: ./integration-test.sh --${{ matrix.test_type }} | ||
|
|
||
| - name: Inspect failure | ||
| if: failure() | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,50 +1,23 @@ | ||
| #!/usr/bin/env bash | ||
| set -ex | ||
|
|
||
| echo "${_group}Setting up variables and helpers ..." | ||
| export SENTRY_TEST_HOST="${SENTRY_TEST_HOST:-https://localhost:9000}" | ||
| TEST_USER='[email protected]' | ||
| TEST_PASS='test123TEST' | ||
| COOKIE_FILE=$(mktemp) | ||
|
|
||
| trap_with_arg cleanup ERR INT TERM EXIT | ||
| echo "${_endgroup}" | ||
|
|
||
| echo "${_group}Starting Sentry for tests ..." | ||
| # Disable beacon for e2e tests | ||
| echo 'SENTRY_BEACON=False' >>$SENTRY_CONFIG_PY | ||
| $dc up -d | ||
| timeout 90 bash -c 'until $(curl -Isf -o /dev/null $SENTRY_TEST_HOST); do printf '.'; sleep 0.5; done' | ||
| # DC exec here is faster, tests run on the slower side and using exec would provide a boost | ||
| echo y | $dc exec web sentry createuser --force-update --superuser --email $TEST_USER --password $TEST_PASS | ||
|
There was a problem hiding this comment. What happens if we exec into the web container but it isn't ready yet? Does docker wait until it is ready, or does this fail? If it's the former, we should There was a problem hiding this comment. Docker compose up will only succeed if the container healthcheck for web passes, so I don't think this will be a problem. That is performed on a previous line, so when the tests get to the createuser logic the web container will always be ready |
||
| printf "Waiting for Sentry to be up" | ||
| echo "" | ||
| echo "${_endgroup}" | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,40 @@ | ||
| #!/usr/bin/env bash | ||
| set -ex | ||
|
|
||
| source install/_lib.sh | ||
| source install/detect-platform.sh | ||
| source install/dc-detect-version.sh | ||
| source install/error-handling.sh | ||
|
|
||
| echo "Reset customizations" | ||
| rm -f sentry/enhance-image.sh | ||
| rm -f sentry/requirements.txt | ||
|
|
||
| test_option="$1" | ||
| export MINIMIZE_DOWNTIME=0 | ||
|
|
||
| if [[ "$test_option" == "--initial-install" ]]; then | ||
| echo "Testing initial install" | ||
| source _integration-test/run.sh | ||
| source _integration-test/ensure-customizations-not-present.sh | ||
| source _integration-test/ensure-backup-restore-works.sh | ||
| elif [[ "$test_option" == "--customizations" ]]; then | ||
| echo "Testing customizations" | ||
| $dc up -d | ||
| echo "Making customizations" | ||
| cat <<EOT >sentry/enhance-image.sh | ||
| #!/bin/bash | ||
| touch /created-by-enhance-image | ||
| apt-get update | ||
| apt-get install -y gcc libsasl2-dev python-dev libldap2-dev libssl-dev | ||
| EOT | ||
| chmod +x sentry/enhance-image.sh | ||
| printf "python-ldap" >sentry/requirements.txt | ||
|
|
||
| echo "Testing in-place upgrade and customizations" | ||
| export MINIMIZE_DOWNTIME=1 | ||
| ./install.sh | ||
| source _integration-test/run.sh | ||
| source _integration-test/ensure-customizations-work.sh | ||
| source _integration-test/ensure-backup-restore-works.sh | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,12 @@ | ||
| #!/usr/bin/env bash | ||
| set -e | ||
|
|
||
| export MINIMIZE_DOWNTIME=0 | ||
| export REPORT_SELF_HOSTED_ISSUES=1 | ||
|
|
||
| # This file runs in https://github.com/getsentry/sentry/blob/fe4795f5eae9e0d7c33e0ecb736c9d1369535eca/docker/cloudbuild.yaml#L59 | ||
| source install/_lib.sh | ||
| source install/detect-platform.sh | ||
| source install/dc-detect-version.sh | ||
| source install/error-handling.sh | ||
| source _integration-test/run.sh |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
docker run is slower than just an exec into a running container
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is but it is also intentional to keep the run separate from the main web process.
That said for a one-off thing like this, I think using
execis a good compromise if it saves a notable amount of time. I'd just want it documented with a brief comment.