Skip to content
Closed
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
35 changes: 0 additions & 35 deletions .github/actions/collect-test-data/action.yml

This file was deleted.

2 changes: 0 additions & 2 deletions .github/file-filters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ backend_dependencies: &backend_dependencies

backend_build_changes: &backend_build_changes
- '.github/workflows/backend.yml'
- '.github/actions/collect-test-data/**'
- '.pre-commit-config.yaml'
- 'Makefile'
- 'pyproject.toml'
Expand Down Expand Up @@ -93,7 +92,6 @@ acceptance: &acceptance
- *frontend_all
- *backend_all
- '.github/workflows/acceptance.yml'
- '.github/actions/collect-test-data/**'

api_docs: &api_docs
- *backend_all
Expand Down
11 changes: 0 additions & 11 deletions .github/workflows/acceptance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,17 +111,6 @@ jobs:
devservices logs
fi

- name: Collect test data
uses: ./.github/actions/collect-test-data
if: ${{ !cancelled() }}
with:
artifact_path: .artifacts/pytest.acceptance.json
gcs_bucket: ${{ secrets.COLLECT_TEST_DATA_GCS_BUCKET }}
gcp_project_id: ${{ secrets.COLLECT_TEST_DATA_GCP_PROJECT_ID }}
workload_identity_provider: ${{ secrets.SENTRY_GCP_DEV_WORKLOAD_IDENTITY_POOL }}
service_account_email: ${{ secrets.COLLECT_TEST_DATA_SERVICE_ACCOUNT_EMAIL }}
matrix_instance_number: ${{ steps.setup.outputs.matrix-instance-number }}

acceptance-required-checks:
# this is a required check so we need this job to always run and report a status.
if: always()
Expand Down
21 changes: 0 additions & 21 deletions .github/workflows/backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -310,17 +310,6 @@ jobs:
devservices logs
fi

- name: Collect test data
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't this also remove the devinfra metrics reporting we rely on?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah - forgot about that

uses: ./.github/actions/collect-test-data
if: ${{ !cancelled() }}
with:
artifact_path: .artifacts/pytest.json
gcs_bucket: ${{ secrets.COLLECT_TEST_DATA_GCS_BUCKET }}
gcp_project_id: ${{ secrets.COLLECT_TEST_DATA_GCP_PROJECT_ID }}
workload_identity_provider: ${{ secrets.SENTRY_GCP_DEV_WORKLOAD_IDENTITY_POOL }}
service_account_email: ${{ secrets.COLLECT_TEST_DATA_SERVICE_ACCOUNT_EMAIL }}
matrix_instance_number: ${{ steps.setup.outputs.matrix-instance-number }}

backend-migration-tests:
if: needs.files-changed.outputs.backend == 'true'
needs: files-changed
Expand Down Expand Up @@ -538,16 +527,6 @@ jobs:
devservices logs
fi

- name: Collect test data
uses: ./.github/actions/collect-test-data
if: ${{ !cancelled() }}
with:
artifact_path: .artifacts/pytest.monolith-dbs.json
gcs_bucket: ${{ secrets.COLLECT_TEST_DATA_GCS_BUCKET }}
gcp_project_id: ${{ secrets.COLLECT_TEST_DATA_GCP_PROJECT_ID }}
workload_identity_provider: ${{ secrets.SENTRY_GCP_DEV_WORKLOAD_IDENTITY_POOL }}
service_account_email: ${{ secrets.COLLECT_TEST_DATA_SERVICE_ACCOUNT_EMAIL }}

typing:
if: needs.files-changed.outputs.backend == 'true'
needs: files-changed
Expand Down
18 changes: 6 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ build-chartcuterie-config:

run-acceptance:
@echo "--> Running acceptance tests"
python3 -b -m pytest tests/acceptance --reuse-db --json-report --json-report-file=".artifacts/pytest.acceptance.json" --json-report-omit=log --junit-xml=".artifacts/acceptance.junit.xml" -o junit_suite_name=acceptance
python3 -b -m pytest tests/acceptance --reuse-db --json-report --json-report-file=".artifacts/pytest.acceptance.json" --json-report-omit=log
@echo ""

test-cli: create-db
Expand Down Expand Up @@ -130,9 +130,7 @@ test-python-ci:
--ignore tests/tools \
--json-report \
--json-report-file=".artifacts/pytest.json" \
--json-report-omit=log \
--junit-xml=.artifacts/pytest.junit.xml \
-o junit_suite_name=pytest
--json-report-omit=log
@echo ""

test-backend-ci-with-coverage:
Expand All @@ -148,9 +146,7 @@ test-backend-ci-with-coverage:
--cov-context=test \
--json-report \
--json-report-file=".artifacts/pytest.json" \
--json-report-omit=log \
--junit-xml=.artifacts/pytest.junit.xml \
-o junit_suite_name=pytest
--json-report-omit=log
@echo ""

compute-selected-tests:
Expand Down Expand Up @@ -200,23 +196,21 @@ test-monolith-dbs:
--reuse-db \
--json-report \
--json-report-file=".artifacts/pytest.monolith-dbs.json" \
--json-report-omit=log \
--junit-xml=.artifacts/monolith-dbs.junit.xml \
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we don't need these junit xmls anymore either; unused

-o junit_suite_name=monolith-dbs \
--json-report-omit=log
;
@echo ""

test-tools:
@echo "--> Running tools tests"
@# bogus configuration to force vanilla pytest
python3 -b -m pytest -c setup.cfg --confcutdir tests/tools tests/tools --reuse-db -vv --junit-xml=.artifacts/tools.junit.xml -o junit_suite_name=tools
python3 -b -m pytest -c setup.cfg --confcutdir tests/tools tests/tools --reuse-db -vv
@echo ""

# JavaScript relay tests are meant to be run within Symbolicator test suite, as they are parametrized to verify both processing pipelines during migration process.
# Running Locally: Run `devservices up` before starting these tests
test-symbolicator:
@echo "--> Running symbolicator tests"
python3 -b -m pytest tests/symbolicator --reuse-db -vv --junit-xml=.artifacts/symbolicator.junit.xml -o junit_suite_name=symbolicator
python3 -b -m pytest tests/symbolicator --reuse-db -vv
python3 -b -m pytest tests/relay_integration/lang/javascript/ --reuse-db -vv -m symbolicator
python3 -b -m pytest tests/relay_integration/lang/java/ --reuse-db -vv -m symbolicator
@echo ""
Expand Down
Loading