From bc4de2d18958f2a6b0fb83ca5c4a35588de8acdf Mon Sep 17 00:00:00 2001 From: Anton Pirker Date: Fri, 21 Feb 2025 16:21:26 +0100 Subject: [PATCH 1/4] Fix clickhouse in our test suite --- .github/workflows/test-integrations-dbs.yml | 20 +++++++++++++++++-- .../templates/test_group.jinja | 10 +++++++++- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-integrations-dbs.yml b/.github/workflows/test-integrations-dbs.yml index d525e353ed..bb6e15dadc 100644 --- a/.github/workflows/test-integrations-dbs.yml +++ b/.github/workflows/test-integrations-dbs.yml @@ -59,7 +59,15 @@ jobs: with: python-version: ${{ matrix.python-version }} allow-prereleases: true - - uses: getsentry/action-clickhouse-in-ci@v1.1 + - name: "Setup ClickHouse Server" + uses: getsentry/action-clickhouse-in-ci@v1.2 + - name: Ensure ClickHouse Ready + run: | + set -x + sleep 3 + docker ps + docker logs clickhouse-test + curl -i 'http://localhost:8123/' --data-binary 'SELECT * FROM system.build_options' - name: Setup Test Env run: | pip install "coverage[toml]" tox @@ -154,7 +162,15 @@ jobs: with: python-version: ${{ matrix.python-version }} allow-prereleases: true - - uses: getsentry/action-clickhouse-in-ci@v1.1 + - name: "Setup ClickHouse Server" + uses: getsentry/action-clickhouse-in-ci@v1.2 + - name: Ensure ClickHouse Ready + run: | + set -x + sleep 3 + docker ps + docker logs clickhouse-test + curl -i 'http://localhost:8123/' --data-binary 'SELECT * FROM system.build_options' - 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..b6e02551c0 100644 --- a/scripts/split_tox_gh_actions/templates/test_group.jinja +++ b/scripts/split_tox_gh_actions/templates/test_group.jinja @@ -51,7 +51,15 @@ python-version: {% raw %}${{ matrix.python-version }}{% endraw %} allow-prereleases: true {% if needs_clickhouse %} - - uses: getsentry/action-clickhouse-in-ci@v1.1 + - name: "Setup ClickHouse Server" + uses: getsentry/action-clickhouse-in-ci@v1.2 + - name: Ensure ClickHouse Ready + run: | + set -x + sleep 3 + docker ps + docker logs clickhouse-test + curl -i 'http://localhost:8123/' --data-binary 'SELECT * FROM system.build_options' {% endif %} {% if needs_redis %} From 0f0e46ba8a5bb9d878e75159c5e13cc16cc84966 Mon Sep 17 00:00:00 2001 From: Anton Pirker Date: Fri, 21 Feb 2025 16:32:37 +0100 Subject: [PATCH 2/4] The status output should be in the action. --- .github/workflows/test-integrations-dbs.yml | 18 ++---------------- .../templates/test_group.jinja | 9 +-------- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/.github/workflows/test-integrations-dbs.yml b/.github/workflows/test-integrations-dbs.yml index bb6e15dadc..93e1a10e0c 100644 --- a/.github/workflows/test-integrations-dbs.yml +++ b/.github/workflows/test-integrations-dbs.yml @@ -60,14 +60,7 @@ jobs: python-version: ${{ matrix.python-version }} allow-prereleases: true - name: "Setup ClickHouse Server" - uses: getsentry/action-clickhouse-in-ci@v1.2 - - name: Ensure ClickHouse Ready - run: | - set -x - sleep 3 - docker ps - docker logs clickhouse-test - curl -i 'http://localhost:8123/' --data-binary 'SELECT * FROM system.build_options' + uses: getsentry/action-clickhouse-in-ci@v1.3 - name: Setup Test Env run: | pip install "coverage[toml]" tox @@ -163,14 +156,7 @@ jobs: python-version: ${{ matrix.python-version }} allow-prereleases: true - name: "Setup ClickHouse Server" - uses: getsentry/action-clickhouse-in-ci@v1.2 - - name: Ensure ClickHouse Ready - run: | - set -x - sleep 3 - docker ps - docker logs clickhouse-test - curl -i 'http://localhost:8123/' --data-binary 'SELECT * FROM system.build_options' + uses: getsentry/action-clickhouse-in-ci@v1.3 - 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 b6e02551c0..27b0af90da 100644 --- a/scripts/split_tox_gh_actions/templates/test_group.jinja +++ b/scripts/split_tox_gh_actions/templates/test_group.jinja @@ -52,14 +52,7 @@ allow-prereleases: true {% if needs_clickhouse %} - name: "Setup ClickHouse Server" - uses: getsentry/action-clickhouse-in-ci@v1.2 - - name: Ensure ClickHouse Ready - run: | - set -x - sleep 3 - docker ps - docker logs clickhouse-test - curl -i 'http://localhost:8123/' --data-binary 'SELECT * FROM system.build_options' + uses: getsentry/action-clickhouse-in-ci@v1.3 {% endif %} {% if needs_redis %} From 4a8b5a990f1739ec0b6680abfdc7aa8621d7a7b0 Mon Sep 17 00:00:00 2001 From: Anton Pirker Date: Fri, 21 Feb 2025 16:42:58 +0100 Subject: [PATCH 3/4] New version is fixed (hopefully) --- .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 93e1a10e0c..9677f0d10f 100644 --- a/.github/workflows/test-integrations-dbs.yml +++ b/.github/workflows/test-integrations-dbs.yml @@ -60,7 +60,7 @@ jobs: python-version: ${{ matrix.python-version }} allow-prereleases: true - name: "Setup ClickHouse Server" - uses: getsentry/action-clickhouse-in-ci@v1.3 + uses: getsentry/action-clickhouse-in-ci@v1.4 - name: Setup Test Env run: | pip install "coverage[toml]" tox @@ -156,7 +156,7 @@ jobs: python-version: ${{ matrix.python-version }} allow-prereleases: true - name: "Setup ClickHouse Server" - uses: getsentry/action-clickhouse-in-ci@v1.3 + uses: getsentry/action-clickhouse-in-ci@v1.4 - 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 27b0af90da..96abaad3b1 100644 --- a/scripts/split_tox_gh_actions/templates/test_group.jinja +++ b/scripts/split_tox_gh_actions/templates/test_group.jinja @@ -52,7 +52,7 @@ allow-prereleases: true {% if needs_clickhouse %} - name: "Setup ClickHouse Server" - uses: getsentry/action-clickhouse-in-ci@v1.3 + uses: getsentry/action-clickhouse-in-ci@v1.4 {% endif %} {% if needs_redis %} From 09553e62df436f5b25861a28ec6c37e0de5d0daa Mon Sep 17 00:00:00 2001 From: Anton Pirker Date: Fri, 21 Feb 2025 16:47:14 +0100 Subject: [PATCH 4/4] bump version --- .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 9677f0d10f..1fb0aa0715 100644 --- a/.github/workflows/test-integrations-dbs.yml +++ b/.github/workflows/test-integrations-dbs.yml @@ -60,7 +60,7 @@ jobs: python-version: ${{ matrix.python-version }} allow-prereleases: true - name: "Setup ClickHouse Server" - uses: getsentry/action-clickhouse-in-ci@v1.4 + uses: getsentry/action-clickhouse-in-ci@v1.5 - name: Setup Test Env run: | pip install "coverage[toml]" tox @@ -156,7 +156,7 @@ jobs: python-version: ${{ matrix.python-version }} allow-prereleases: true - name: "Setup ClickHouse Server" - uses: getsentry/action-clickhouse-in-ci@v1.4 + uses: getsentry/action-clickhouse-in-ci@v1.5 - 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 96abaad3b1..01f9cd56ec 100644 --- a/scripts/split_tox_gh_actions/templates/test_group.jinja +++ b/scripts/split_tox_gh_actions/templates/test_group.jinja @@ -52,7 +52,7 @@ allow-prereleases: true {% if needs_clickhouse %} - name: "Setup ClickHouse Server" - uses: getsentry/action-clickhouse-in-ci@v1.4 + uses: getsentry/action-clickhouse-in-ci@v1.5 {% endif %} {% if needs_redis %}