Skip to content

Commit 6048c11

Browse files
committed
community workflow: fix integration tests db query and remove compat check
1 parent 36fdc10 commit 6048c11

File tree

10 files changed

+8
-95
lines changed

10 files changed

+8
-95
lines changed

.github/workflows/backport_branches.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ env:
2828
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
2929
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
3030
CHECKS_DATABASE_HOST: ${{ secrets.CHECKS_DATABASE_HOST }}
31+
CLICKHOUSE_PLAY_DB: gh-data
3132
AZURE_STORAGE_KEY: ${{ secrets.AZURE_STORAGE_KEY }}
3233
AZURE_ACCOUNT_NAME: ${{ secrets.AZURE_ACCOUNT_NAME }}
3334
AZURE_CONTAINER_NAME: ${{ secrets.AZURE_CONTAINER_NAME }}

.github/workflows/master.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ env:
2727
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
2828
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
2929
CHECKS_DATABASE_HOST: ${{ secrets.CHECKS_DATABASE_HOST }}
30+
CLICKHOUSE_PLAY_DB: gh-data
3031
AZURE_STORAGE_KEY: ${{ secrets.AZURE_STORAGE_KEY }}
3132
AZURE_ACCOUNT_NAME: ${{ secrets.AZURE_ACCOUNT_NAME }}
3233
AZURE_CONTAINER_NAME: ${{ secrets.AZURE_CONTAINER_NAME }}

.github/workflows/merge_queue.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ env:
1818
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
1919
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
2020
CHECKS_DATABASE_HOST: ${{ secrets.CHECKS_DATABASE_HOST }}
21+
CLICKHOUSE_PLAY_DB: gh-data
2122
AZURE_STORAGE_KEY: ${{ secrets.AZURE_STORAGE_KEY }}
2223
AZURE_ACCOUNT_NAME: ${{ secrets.AZURE_ACCOUNT_NAME }}
2324
AZURE_CONTAINER_NAME: ${{ secrets.AZURE_CONTAINER_NAME }}

.github/workflows/pull_request.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ env:
2828
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
2929
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
3030
CHECKS_DATABASE_HOST: ${{ secrets.CHECKS_DATABASE_HOST }}
31+
CLICKHOUSE_PLAY_DB: gh-data
3132
AZURE_STORAGE_KEY: ${{ secrets.AZURE_STORAGE_KEY }}
3233
AZURE_ACCOUNT_NAME: ${{ secrets.AZURE_ACCOUNT_NAME }}
3334
AZURE_CONTAINER_NAME: ${{ secrets.AZURE_CONTAINER_NAME }}

.github/workflows/pull_request_external.yml

Lines changed: 0 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -3807,96 +3807,6 @@ jobs:
38073807
python3 -m praktika run 'Install packages (amd_debug)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
38083808
fi
38093809
3810-
compatibility_check_release:
3811-
runs-on: [self-hosted, altinity-on-demand, altinity-style-checker]
3812-
needs: [config_workflow, build_amd_release, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel]
3813-
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'Q29tcGF0aWJpbGl0eSBjaGVjayAocmVsZWFzZSk=') }}
3814-
name: "Compatibility check (release)"
3815-
outputs:
3816-
data: ${{ steps.run.outputs.DATA }}
3817-
steps:
3818-
- name: Checkout code
3819-
uses: actions/checkout@v4
3820-
with:
3821-
ref: ${{ env.CHECKOUT_REF }}
3822-
3823-
- name: Setup
3824-
uses: ./.github/actions/runner_setup
3825-
- name: Docker setup
3826-
uses: ./.github/actions/docker_setup
3827-
with:
3828-
test_name: "Compatibility check (release)"
3829-
3830-
- name: Prepare env script
3831-
run: |
3832-
rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
3833-
mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
3834-
cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
3835-
export PYTHONPATH=./ci:.:
3836-
cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
3837-
${{ needs.config_workflow.outputs.data }}
3838-
EOF
3839-
cat > ./ci/tmp/workflow_status.json << 'EOF'
3840-
${{ toJson(needs) }}
3841-
EOF
3842-
ENV_SETUP_SCRIPT_EOF
3843-
3844-
- name: Run
3845-
id: run
3846-
run: |
3847-
. ./ci/tmp/praktika_setup_env.sh
3848-
set -o pipefail
3849-
if command -v ts &> /dev/null; then
3850-
python3 -m praktika run 'Compatibility check (release)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
3851-
else
3852-
python3 -m praktika run 'Compatibility check (release)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
3853-
fi
3854-
3855-
compatibility_check_aarch64:
3856-
runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
3857-
needs: [config_workflow, build_arm_release, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel]
3858-
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'Q29tcGF0aWJpbGl0eSBjaGVjayAoYWFyY2g2NCk=') }}
3859-
name: "Compatibility check (aarch64)"
3860-
outputs:
3861-
data: ${{ steps.run.outputs.DATA }}
3862-
steps:
3863-
- name: Checkout code
3864-
uses: actions/checkout@v4
3865-
with:
3866-
ref: ${{ env.CHECKOUT_REF }}
3867-
3868-
- name: Setup
3869-
uses: ./.github/actions/runner_setup
3870-
- name: Docker setup
3871-
uses: ./.github/actions/docker_setup
3872-
with:
3873-
test_name: "Compatibility check (aarch64)"
3874-
3875-
- name: Prepare env script
3876-
run: |
3877-
rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
3878-
mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
3879-
cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
3880-
export PYTHONPATH=./ci:.:
3881-
cat > ./ci/tmp/workflow_config_community_pr.json << 'EOF'
3882-
${{ needs.config_workflow.outputs.data }}
3883-
EOF
3884-
cat > ./ci/tmp/workflow_status.json << 'EOF'
3885-
${{ toJson(needs) }}
3886-
EOF
3887-
ENV_SETUP_SCRIPT_EOF
3888-
3889-
- name: Run
3890-
id: run
3891-
run: |
3892-
. ./ci/tmp/praktika_setup_env.sh
3893-
set -o pipefail
3894-
if command -v ts &> /dev/null; then
3895-
python3 -m praktika run 'Compatibility check (aarch64)' --workflow "Community PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
3896-
else
3897-
python3 -m praktika run 'Compatibility check (aarch64)' --workflow "Community PR" --ci |& tee ./ci/tmp/job.log
3898-
fi
3899-
39003810
stress_test_amd_debug:
39013811
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
39023812
needs: [config_workflow, build_amd_debug, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel]

.github/workflows/release_branches.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ env:
2727
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
2828
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
2929
CHECKS_DATABASE_HOST: ${{ secrets.CHECKS_DATABASE_HOST }}
30+
CLICKHOUSE_PLAY_DB: gh-data
3031
AZURE_STORAGE_KEY: ${{ secrets.AZURE_STORAGE_KEY }}
3132
AZURE_ACCOUNT_NAME: ${{ secrets.AZURE_ACCOUNT_NAME }}
3233
AZURE_CONTAINER_NAME: ${{ secrets.AZURE_CONTAINER_NAME }}

.github/workflows/release_builds.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ env:
1717
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
1818
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
1919
CHECKS_DATABASE_HOST: ${{ secrets.CHECKS_DATABASE_HOST }}
20+
CLICKHOUSE_PLAY_DB: gh-data
2021
AZURE_STORAGE_KEY: ${{ secrets.AZURE_STORAGE_KEY }}
2122
AZURE_ACCOUNT_NAME: ${{ secrets.AZURE_ACCOUNT_NAME }}
2223
AZURE_CONTAINER_NAME: ${{ secrets.AZURE_CONTAINER_NAME }}

ci/jobs/scripts/integration_tests_runner.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
CLICKHOUSE_PLAY_HOST = os.environ.get("CHECKS_DATABASE_HOST", "play.clickhouse.com")
3030
CLICKHOUSE_PLAY_USER = os.environ.get("CLICKHOUSE_TEST_STAT_LOGIN", "play")
3131
CLICKHOUSE_PLAY_PASSWORD = os.environ.get("CLICKHOUSE_TEST_STAT_PASSWORD", "")
32-
CLICKHOUSE_PLAY_DB = os.environ.get("CLICKHOUSE_PLAY_DB", "gh-data")
32+
CLICKHOUSE_PLAY_DB = os.environ.get("CLICKHOUSE_PLAY_DB", "default")
3333
CLICKHOUSE_PLAY_URL = f"https://{CLICKHOUSE_PLAY_HOST}:8443/"
3434

3535

ci/praktika/yaml_additional_templates.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ class AltinityWorkflowTemplates:
33
# Braces must be escaped
44
ADDITIONAL_GLOBAL_ENV = r""" AWS_DEFAULT_REGION: ${{{{ secrets.AWS_DEFAULT_REGION }}}}
55
CHECKS_DATABASE_HOST: ${{{{ secrets.CHECKS_DATABASE_HOST }}}}
6+
CLICKHOUSE_PLAY_DB: gh-data
67
AZURE_STORAGE_KEY: ${{{{ secrets.AZURE_STORAGE_KEY }}}}
78
AZURE_ACCOUNT_NAME: ${{{{ secrets.AZURE_ACCOUNT_NAME }}}}
89
AZURE_CONTAINER_NAME: ${{{{ secrets.AZURE_CONTAINER_NAME }}}}

ci/workflows/pull_request_external.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,6 @@
5858
job.set_dependency(FUNCTIONAL_TESTS_PARALLEL_BLOCKING_JOB_NAMES)
5959
for job in JobConfigs.install_check_jobs
6060
],
61-
*[
62-
job.set_dependency(FUNCTIONAL_TESTS_PARALLEL_BLOCKING_JOB_NAMES)
63-
for job in JobConfigs.compatibility_test_jobs
64-
],
6561
*[
6662
job.set_dependency(FUNCTIONAL_TESTS_PARALLEL_BLOCKING_JOB_NAMES)
6763
for job in JobConfigs.stress_test_jobs

0 commit comments

Comments
 (0)