From 6ee74ef1fe8fa55580574fdcbf5400ccd1e8ce41 Mon Sep 17 00:00:00 2001 From: hubertdeng123 Date: Wed, 29 May 2024 10:03:04 -0700 Subject: [PATCH 01/10] use env custom file if it exists for tests --- _integration-test/conftest.py | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/_integration-test/conftest.py b/_integration-test/conftest.py index b36097d605..80418991f8 100644 --- a/_integration-test/conftest.py +++ b/_integration-test/conftest.py @@ -18,11 +18,27 @@ def pytest_addoption(parser): @pytest.fixture(scope="session", autouse=True) def configure_self_hosted_environment(request): - subprocess.run( - ["docker", "compose", "--ansi", "never", "up", "-d"], - check=True, - capture_output=True, - ) + if os.path.exists(".env.custom"): + subprocess.run( + [ + "docker", + "compose", + "--ansi", + "never", + "--env-file", + ".env.custom", + "up", + "-d", + ], + check=True, + capture_output=True, + ) + else: + subprocess.run( + ["docker", "compose", "--ansi", "never", "up", "-d"], + check=True, + capture_output=True, + ) for i in range(TIMEOUT_SECONDS): try: response = httpx.get(SENTRY_TEST_HOST, follow_redirects=True) From e705683314ff623c2976710061ac163c3547ecb9 Mon Sep 17 00:00:00 2001 From: hubertdeng123 Date: Wed, 29 May 2024 11:36:56 -0700 Subject: [PATCH 02/10] see if this fails --- .github/workflows/test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e2303cd97d..13ea6dc0e3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,7 +27,9 @@ jobs: - name: End to end tests uses: getsentry/action-self-hosted-e2e-tests@main with: - project_name: self-hosted + project_name: relay + image_url: ghcr.io/getsentry/relay:e27613a1b41bef3a417aef4031d234114903b2f8 + docker_repo: getsentry/relay unit-test: if: github.repository_owner == 'getsentry' From 0bda31f8ebb17711a0cf77950f6408998b5252ca Mon Sep 17 00:00:00 2001 From: hubertdeng123 Date: Wed, 29 May 2024 11:41:39 -0700 Subject: [PATCH 03/10] ? --- .github/workflows/test.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 13ea6dc0e3..3304211044 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,8 +21,6 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - with: - path: self-hosted - name: End to end tests uses: getsentry/action-self-hosted-e2e-tests@main From d5a428035b23c47966a39363028705c2a6bd2f11 Mon Sep 17 00:00:00 2001 From: hubertdeng123 Date: Wed, 29 May 2024 12:00:58 -0700 Subject: [PATCH 04/10] just a bit of testing --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 8e54a3df2c..268d96b4e6 100644 --- a/.env +++ b/.env @@ -7,7 +7,7 @@ SENTRY_BIND=9000 # SENTRY_MAIL_HOST=example.com SENTRY_IMAGE=getsentry/sentry:nightly SNUBA_IMAGE=getsentry/snuba:nightly -RELAY_IMAGE=getsentry/relay:nightly +RELAY_IMAGE=ghcr.io/getsentry/relay:e27613a1b41bef3a417aef4031d234114903b2f8 SYMBOLICATOR_IMAGE=getsentry/symbolicator:nightly VROOM_IMAGE=getsentry/vroom:nightly WAL2JSON_VERSION=latest From bdd46c0d7575aa64898351b5df30a2e89a83dbc5 Mon Sep 17 00:00:00 2001 From: hubertdeng123 Date: Wed, 29 May 2024 12:15:52 -0700 Subject: [PATCH 05/10] oops try this --- .env | 2 +- sentry/sentry.conf.example.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env b/.env index 268d96b4e6..8e54a3df2c 100644 --- a/.env +++ b/.env @@ -7,7 +7,7 @@ SENTRY_BIND=9000 # SENTRY_MAIL_HOST=example.com SENTRY_IMAGE=getsentry/sentry:nightly SNUBA_IMAGE=getsentry/snuba:nightly -RELAY_IMAGE=ghcr.io/getsentry/relay:e27613a1b41bef3a417aef4031d234114903b2f8 +RELAY_IMAGE=getsentry/relay:nightly SYMBOLICATOR_IMAGE=getsentry/symbolicator:nightly VROOM_IMAGE=getsentry/vroom:nightly WAL2JSON_VERSION=latest diff --git a/sentry/sentry.conf.example.py b/sentry/sentry.conf.example.py index 5213d1e06a..31fbe4de4c 100644 --- a/sentry/sentry.conf.example.py +++ b/sentry/sentry.conf.example.py @@ -295,7 +295,7 @@ def get_internal_network(): ) + ( "organizations:deprecate-fid-from-performance-score", - "organizations:indexed-spans-extraction", + # "organizations:indexed-spans-extraction", "organizations:insights-entry-points", "organizations:insights-initial-modules", "organizations:mobile-ttid-ttfd-contribution", From 73a883b15faf3033a488f8b8bef7de762f19189b Mon Sep 17 00:00:00 2001 From: hubertdeng123 Date: Wed, 29 May 2024 13:11:41 -0700 Subject: [PATCH 06/10] change commit sha --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d005b1ae87..5c2cef9568 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -26,7 +26,7 @@ jobs: uses: getsentry/action-self-hosted-e2e-tests@main with: project_name: relay - image_url: ghcr.io/getsentry/relay:e27613a1b41bef3a417aef4031d234114903b2f8 + image_url: ghcr.io/getsentry/relay:8b7612f44d91ce0770b11006fcb526812d6c3f25 docker_repo: getsentry/relay unit-test: From a2719d86a36aa7a527b271d376f1084be08e0b87 Mon Sep 17 00:00:00 2001 From: hubertdeng123 Date: Wed, 29 May 2024 13:32:18 -0700 Subject: [PATCH 07/10] pin to specific relay image --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 8e54a3df2c..97a771fa02 100644 --- a/.env +++ b/.env @@ -7,7 +7,7 @@ SENTRY_BIND=9000 # SENTRY_MAIL_HOST=example.com SENTRY_IMAGE=getsentry/sentry:nightly SNUBA_IMAGE=getsentry/snuba:nightly -RELAY_IMAGE=getsentry/relay:nightly +RELAY_IMAGE=ghcr.io/getsentry/relay:8b7612f44d91ce0770b11006fcb526812d6c3f25 SYMBOLICATOR_IMAGE=getsentry/symbolicator:nightly VROOM_IMAGE=getsentry/vroom:nightly WAL2JSON_VERSION=latest From 905aab31017d7fb1800795c704bc315ecdd3f7c1 Mon Sep 17 00:00:00 2001 From: hubertdeng123 Date: Wed, 29 May 2024 14:20:33 -0700 Subject: [PATCH 08/10] testing edits on composite action --- .env | 2 +- .github/workflows/test.yml | 2 +- _integration-test/conftest.py | 26 +++++--------------------- 3 files changed, 7 insertions(+), 23 deletions(-) diff --git a/.env b/.env index 97a771fa02..8e54a3df2c 100644 --- a/.env +++ b/.env @@ -7,7 +7,7 @@ SENTRY_BIND=9000 # SENTRY_MAIL_HOST=example.com SENTRY_IMAGE=getsentry/sentry:nightly SNUBA_IMAGE=getsentry/snuba:nightly -RELAY_IMAGE=ghcr.io/getsentry/relay:8b7612f44d91ce0770b11006fcb526812d6c3f25 +RELAY_IMAGE=getsentry/relay:nightly SYMBOLICATOR_IMAGE=getsentry/symbolicator:nightly VROOM_IMAGE=getsentry/vroom:nightly WAL2JSON_VERSION=latest diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5c2cef9568..477237882e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,7 +23,7 @@ jobs: uses: actions/checkout@v4 - name: End to end tests - uses: getsentry/action-self-hosted-e2e-tests@main + uses: getsentry/action-self-hosted-e2e-tests@f21f7c9c863f59b8cef059859e50435566fae399 with: project_name: relay image_url: ghcr.io/getsentry/relay:8b7612f44d91ce0770b11006fcb526812d6c3f25 diff --git a/_integration-test/conftest.py b/_integration-test/conftest.py index 80418991f8..b36097d605 100644 --- a/_integration-test/conftest.py +++ b/_integration-test/conftest.py @@ -18,27 +18,11 @@ def pytest_addoption(parser): @pytest.fixture(scope="session", autouse=True) def configure_self_hosted_environment(request): - if os.path.exists(".env.custom"): - subprocess.run( - [ - "docker", - "compose", - "--ansi", - "never", - "--env-file", - ".env.custom", - "up", - "-d", - ], - check=True, - capture_output=True, - ) - else: - subprocess.run( - ["docker", "compose", "--ansi", "never", "up", "-d"], - check=True, - capture_output=True, - ) + subprocess.run( + ["docker", "compose", "--ansi", "never", "up", "-d"], + check=True, + capture_output=True, + ) for i in range(TIMEOUT_SECONDS): try: response = httpx.get(SENTRY_TEST_HOST, follow_redirects=True) From 05b3aa085398ca96080cfb376e8defc866ac905b Mon Sep 17 00:00:00 2001 From: hubertdeng123 Date: Wed, 29 May 2024 14:46:01 -0700 Subject: [PATCH 09/10] change back --- .github/workflows/test.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 477237882e..35efdfa6bc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,11 +23,9 @@ jobs: uses: actions/checkout@v4 - name: End to end tests - uses: getsentry/action-self-hosted-e2e-tests@f21f7c9c863f59b8cef059859e50435566fae399 + uses: getsentry/action-self-hosted-e2e-tests@main with: - project_name: relay - image_url: ghcr.io/getsentry/relay:8b7612f44d91ce0770b11006fcb526812d6c3f25 - docker_repo: getsentry/relay + project_name: self-hosted unit-test: if: github.repository_owner == 'getsentry' From 1b0386c1e957a13abca3435fb0556b0fef853788 Mon Sep 17 00:00:00 2001 From: hubertdeng123 Date: Wed, 29 May 2024 14:47:34 -0700 Subject: [PATCH 10/10] add back --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 35efdfa6bc..8acdb98813 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,6 +21,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + with: + path: self-hosted - name: End to end tests uses: getsentry/action-self-hosted-e2e-tests@main