From ab75bd637696d5d121951da03ae3c238044232aa Mon Sep 17 00:00:00 2001 From: Anton Pirker Date: Fri, 21 Feb 2025 10:23:14 +0100 Subject: [PATCH 1/4] Fix auth in clickhouse server running in test suite --- .github/workflows/test-integrations-dbs.yml | 6 ++++++ scripts/split_tox_gh_actions/templates/test_group.jinja | 3 +++ 2 files changed, 9 insertions(+) diff --git a/.github/workflows/test-integrations-dbs.yml b/.github/workflows/test-integrations-dbs.yml index d525e353ed..6a3752aace 100644 --- a/.github/workflows/test-integrations-dbs.yml +++ b/.github/workflows/test-integrations-dbs.yml @@ -60,6 +60,9 @@ jobs: python-version: ${{ matrix.python-version }} allow-prereleases: true - uses: getsentry/action-clickhouse-in-ci@v1.1 + with: + docker-run-options: >- + -e CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT=0 - name: Setup Test Env run: | pip install "coverage[toml]" tox @@ -155,6 +158,9 @@ jobs: python-version: ${{ matrix.python-version }} allow-prereleases: true - uses: getsentry/action-clickhouse-in-ci@v1.1 + with: + docker-run-options: >- + -e CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT=0 - name: Setup Test Env run: | pip install "coverage[toml]" tox diff --git a/scripts/split_tox_gh_actions/templates/test_group.jinja b/scripts/split_tox_gh_actions/templates/test_group.jinja index 66e346511d..104e7a464f 100644 --- a/scripts/split_tox_gh_actions/templates/test_group.jinja +++ b/scripts/split_tox_gh_actions/templates/test_group.jinja @@ -52,6 +52,9 @@ allow-prereleases: true {% if needs_clickhouse %} - uses: getsentry/action-clickhouse-in-ci@v1.1 + with: + docker-run-options: >- + -e CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT=0 {% endif %} {% if needs_redis %} From 52532a4c9874727baaacf716add99b81f0688745 Mon Sep 17 00:00:00 2001 From: Anton Pirker Date: Fri, 21 Feb 2025 10:33:32 +0100 Subject: [PATCH 2/4] fix indentation --- .github/workflows/test-integrations-dbs.yml | 8 ++++---- scripts/split_tox_gh_actions/templates/test_group.jinja | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test-integrations-dbs.yml b/.github/workflows/test-integrations-dbs.yml index 6a3752aace..f584ec964a 100644 --- a/.github/workflows/test-integrations-dbs.yml +++ b/.github/workflows/test-integrations-dbs.yml @@ -61,8 +61,8 @@ jobs: allow-prereleases: true - uses: getsentry/action-clickhouse-in-ci@v1.1 with: - docker-run-options: >- - -e CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT=0 + docker-run-options: >- + -e CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT=0 - name: Setup Test Env run: | pip install "coverage[toml]" tox @@ -159,8 +159,8 @@ jobs: allow-prereleases: true - uses: getsentry/action-clickhouse-in-ci@v1.1 with: - docker-run-options: >- - -e CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT=0 + docker-run-options: >- + -e CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT=0 - name: Setup Test Env run: | pip install "coverage[toml]" tox diff --git a/scripts/split_tox_gh_actions/templates/test_group.jinja b/scripts/split_tox_gh_actions/templates/test_group.jinja index 104e7a464f..508ee0828c 100644 --- a/scripts/split_tox_gh_actions/templates/test_group.jinja +++ b/scripts/split_tox_gh_actions/templates/test_group.jinja @@ -53,8 +53,8 @@ {% if needs_clickhouse %} - uses: getsentry/action-clickhouse-in-ci@v1.1 with: - docker-run-options: >- - -e CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT=0 + docker-run-options: >- + -e CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT=0 {% endif %} {% if needs_redis %} From e1cf93c9ececad414e30460e7b56774203c96bb3 Mon Sep 17 00:00:00 2001 From: Anton Pirker Date: Fri, 21 Feb 2025 11:00:20 +0100 Subject: [PATCH 3/4] using other env --- .github/workflows/test-integrations-dbs.yml | 4 ++-- scripts/split_tox_gh_actions/templates/test_group.jinja | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-integrations-dbs.yml b/.github/workflows/test-integrations-dbs.yml index f584ec964a..e2f8896c1d 100644 --- a/.github/workflows/test-integrations-dbs.yml +++ b/.github/workflows/test-integrations-dbs.yml @@ -62,7 +62,7 @@ jobs: - uses: getsentry/action-clickhouse-in-ci@v1.1 with: docker-run-options: >- - -e CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT=0 + -e CLICKHOUSE_SKIP_USER_SETUP=1 - name: Setup Test Env run: | pip install "coverage[toml]" tox @@ -160,7 +160,7 @@ jobs: - uses: getsentry/action-clickhouse-in-ci@v1.1 with: docker-run-options: >- - -e CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT=0 + -e CLICKHOUSE_SKIP_USER_SETUP=1 - name: Setup Test Env run: | pip install "coverage[toml]" tox diff --git a/scripts/split_tox_gh_actions/templates/test_group.jinja b/scripts/split_tox_gh_actions/templates/test_group.jinja index 508ee0828c..0fa9412fca 100644 --- a/scripts/split_tox_gh_actions/templates/test_group.jinja +++ b/scripts/split_tox_gh_actions/templates/test_group.jinja @@ -54,7 +54,7 @@ - uses: getsentry/action-clickhouse-in-ci@v1.1 with: docker-run-options: >- - -e CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT=0 + -e CLICKHOUSE_SKIP_USER_SETUP=1 {% endif %} {% if needs_redis %} From f942e4d3863df1be144924595198c3f7cc4c24a8 Mon Sep 17 00:00:00 2001 From: Anton Pirker Date: Fri, 21 Feb 2025 11:08:15 +0100 Subject: [PATCH 4/4] . --- .github/workflows/test-integrations-dbs.yml | 10 ++++------ .../split_tox_gh_actions/templates/test_group.jinja | 5 ++--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test-integrations-dbs.yml b/.github/workflows/test-integrations-dbs.yml index e2f8896c1d..8e616a116f 100644 --- a/.github/workflows/test-integrations-dbs.yml +++ b/.github/workflows/test-integrations-dbs.yml @@ -60,9 +60,8 @@ jobs: python-version: ${{ matrix.python-version }} allow-prereleases: true - uses: getsentry/action-clickhouse-in-ci@v1.1 - with: - docker-run-options: >- - -e CLICKHOUSE_SKIP_USER_SETUP=1 + env: + CLICKHOUSE_SKIP_USER_SETUP: 1 - name: Setup Test Env run: | pip install "coverage[toml]" tox @@ -158,9 +157,8 @@ jobs: python-version: ${{ matrix.python-version }} allow-prereleases: true - uses: getsentry/action-clickhouse-in-ci@v1.1 - with: - docker-run-options: >- - -e CLICKHOUSE_SKIP_USER_SETUP=1 + env: + CLICKHOUSE_SKIP_USER_SETUP: 1 - name: Setup Test Env run: | pip install "coverage[toml]" tox diff --git a/scripts/split_tox_gh_actions/templates/test_group.jinja b/scripts/split_tox_gh_actions/templates/test_group.jinja index 0fa9412fca..6224ab0720 100644 --- a/scripts/split_tox_gh_actions/templates/test_group.jinja +++ b/scripts/split_tox_gh_actions/templates/test_group.jinja @@ -52,9 +52,8 @@ allow-prereleases: true {% if needs_clickhouse %} - uses: getsentry/action-clickhouse-in-ci@v1.1 - with: - docker-run-options: >- - -e CLICKHOUSE_SKIP_USER_SETUP=1 + env: + CLICKHOUSE_SKIP_USER_SETUP: 1 {% endif %} {% if needs_redis %}