Skip to content

Commit 3f49b6a

Browse files
EnmkEnmk
authored
Merge pull request #793 from Altinity/customizations/24.3.18
24.3.18 Pre-release PR 2
2 parents 7a1b539 + ecd4402 commit 3f49b6a

File tree

9 files changed

+73
-32
lines changed

9 files changed

+73
-32
lines changed

‎.github/create_workflow_report.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,15 +434,15 @@ def get_cves(pr_number, commit_sha):
434434
def url_to_html_link(url: str) -> str:
435435
if not url:
436436
return ""
437-
text = url.split("/")[-1]
437+
text = url.split("/")[-1].replace("__", "_")
438438
if not text:
439439
text = "results"
440440
return f'<a href="{url}">{text}</a>'
441441

442442

443443
def format_test_name_for_linewrap(text: str) -> str:
444444
"""Tweak the test name to improve line wrapping."""
445-
return text.replace(".py::", "/")
445+
return f'<span style="line-break: anywhere;">{text}</span>'
446446

447447

448448
def format_test_status(text: str) -> str:

‎.github/grype/run_grype_scan.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -e
33

44
IMAGE=$1
55

6-
GRYPE_VERSION="v0.80.1"
6+
GRYPE_VERSION=${GRYPE_VERSION:-"v0.92.2"}
77

88
docker pull $IMAGE
99
docker pull anchore/grype:${GRYPE_VERSION}

‎.github/workflows/grype_scan.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ env:
2020
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
2121
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
2222
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
23+
GRYPE_VERSION: "v0.92.2-arm64v8"
2324

2425
jobs:
2526
grype_scan:

‎.github/workflows/regression.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ env:
9494
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
9595
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
9696
CHECKS_DATABASE_HOST: ${{ secrets.CHECKS_DATABASE_HOST }}
97-
CHECKS_DATABASE_USER: ${{ secrets.CHECKS_DATABASE_USER }}
98-
CHECKS_DATABASE_PASSWORD: ${{ secrets.CHECKS_DATABASE_PASSWORD }}
97+
CHECKS_DATABASE_USER: ${{ secrets.CLICKHOUSE_TEST_STAT_LOGIN }}
98+
CHECKS_DATABASE_PASSWORD: ${{ secrets.CLICKHOUSE_TEST_STAT_PASSWORD }}
9999
args: --test-to-end
100100
--no-colors
101101
--local

‎.github/workflows/release_branches.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -486,8 +486,8 @@ jobs:
486486
##################################### REGRESSION TESTS ######################################
487487
#############################################################################################
488488
RegressionTestsRelease:
489-
needs: [BuilderDebRelease]
490-
if: ${{ !failure() && !cancelled() }}
489+
needs: [RunConfig, BuilderDebRelease]
490+
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.RunConfig.outputs.data).ci_settings.exclude_keywords, 'regression')}}
491491
uses: ./.github/workflows/regression.yml
492492
secrets: inherit
493493
with:
@@ -497,8 +497,8 @@ jobs:
497497
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
498498
timeout_minutes: 300
499499
RegressionTestsAarch64:
500-
needs: [BuilderDebAarch64]
501-
if: ${{ !failure() && !cancelled() }}
500+
needs: [RunConfig, BuilderDebAarch64]
501+
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.RunConfig.outputs.data).ci_settings.exclude_keywords, 'regression') && !contains(fromJson(needs.RunConfig.outputs.data).ci_settings.exclude_keywords, 'aarch64')}}
502502
uses: ./.github/workflows/regression.yml
503503
secrets: inherit
504504
with:
@@ -572,8 +572,8 @@ jobs:
572572
- name: Create and upload combined report
573573
env:
574574
CHECKS_DATABASE_HOST: ${{ secrets.CHECKS_DATABASE_HOST }}
575-
CHECKS_DATABASE_USER: ${{ secrets.CHECKS_DATABASE_USER }}
576-
CHECKS_DATABASE_PASSWORD: ${{ secrets.CHECKS_DATABASE_PASSWORD }}
575+
CHECKS_DATABASE_USER: ${{ secrets.CLICKHOUSE_TEST_STAT_LOGIN }}
576+
CHECKS_DATABASE_PASSWORD: ${{ secrets.CLICKHOUSE_TEST_STAT_PASSWORD }}
577577
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
578578
COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
579579
PR_NUMBER: ${{ github.event.pull_request.number || 0 }}
@@ -590,4 +590,4 @@ jobs:
590590
else
591591
echo "Error: $REPORT_LINK" >> $GITHUB_STEP_SUMMARY
592592
exit 1
593-
fi
593+
fi

‎docker/test/stress/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# rebuild in #33610
22
# docker build -t altinityinfra/stress-test .
33
ARG FROM_TAG=latest
4-
FROM altinityinfra/stateful-test:$FROM_TAG
4+
FROM altinityinfra/stateful-test:ce3c0a6ed901
55

66
RUN apt-get update -y \
77
&& env DEBIAN_FRONTEND=noninteractive \

‎docker/test/stress/run.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ azurite-blob --blobHost 0.0.0.0 --blobPort 10000 --debug /azurite_log &
5757

5858
config_logs_export_cluster /etc/clickhouse-server/config.d/system_logs_export.yaml
5959

60+
# NOTE(strtgbb): Trying to avoid errors that may be related to running out of resources
61+
export CLICKHOUSE_MAX_THREADS=8
62+
export CLICKHOUSE_MAX_CONCURRENT_QUERIES=4
63+
6064
start_server
6165

6266
setup_logs_replication

‎tests/broken_tests.json‎

Lines changed: 54 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,94 @@
11
{
22
"test_postgresql_replica_database_engine_2/test.py::test_quoting_publication": {
33
"message": "DB::Exception: Syntax error:",
4-
"reason": "syntax error"
4+
"reason": "NEEDSFIX syntax error"
55
},
66
"test_distributed_inter_server_secret/test.py::test_secure_cluster_distributed_over_distributed_different_users": {
77
"message": "DB::NetException: Connection reset by peer, while reading from socket",
8-
"reason": "network issue"
8+
"reason": "NEEDSFIX network issue"
99
},
1010
"02920_alter_column_of_projections": {
11-
"reason": "requires different settings"
11+
"reason": "NEEDSFIX requires different settings"
1212
},
1313
"02888_system_tables_with_inaccsessible_table_function": {
14-
"reason": "todo investigate"
14+
"reason": "INVESTIGATE"
15+
},
16+
"02481_async_insert_dedup": {
17+
"reason": "INVESTIGATE - fails in debug"
18+
},
19+
"02286_quantile_tdigest_infinity": {
20+
"reason": "INVESTIGATE - fails in tsan"
1521
},
1622
"03094_grouparraysorted_memory": {
17-
"reason": "flaky"
23+
"reason": "KNOWN flaky"
1824
},
1925
"02700_s3_part_INT_MAX": {
20-
"reason": "fails with asan"
26+
"reason": "KNOWN fails with asan"
27+
},
28+
"02783_parsedatetimebesteffort_syslog": {
29+
"reason": "NEEDSFIX - fixed upstream, needs backport"
30+
},
31+
"03145_non_loaded_projection_backup": {
32+
"reason": "INVESTIGATE - fails in tsan"
33+
},
34+
"00078_group_by_arrays": {
35+
"reason": "INVESTIGATE - fail in debug"
36+
},
37+
"02539_settings_aliases": {
38+
"reason": "INVESTIGATE - fail in msan"
39+
},
40+
"01052_window_view_proc_tumble_to_now": {
41+
"reason": "INVESTIGATE - fail in msan"
2142
},
2243
"test_backward_compatibility/test_aggregate_function_state.py::test_backward_compatability_for_avg":{
23-
"reason": "not run by upstream"
44+
"reason": "KNOWN not run by upstream"
2445
},
2546
"test_backward_compatibility/test_aggregate_function_state.py::test_backward_compatability_for_uniq_exact[1000]":{
26-
"reason": "not run by upstream"
47+
"reason": "KNOWN not run by upstream"
2748
},
2849
"test_backward_compatibility/test_aggregate_function_state.py::test_backward_compatability_for_uniq_exact[500000] ":{
29-
"reason": "not run by upstream"
50+
"reason": "KNOWN not run by upstream"
3051
},
3152
"test_backward_compatibility/test_aggregate_function_state.py::test_backward_compatability_for_uniq_exact_variadic[1000]":{
32-
"reason": "not run by upstream"
53+
"reason": "KNOWN not run by upstream"
3354
},
3455
"test_backward_compatibility/test_aggregate_function_state.py::test_backward_compatability_for_uniq_exact_variadic[500000]":{
35-
"reason": "not run by upstream"
56+
"reason": "KNOWN not run by upstream"
3657
},
3758
"test_dictionaries_all_layouts_separate_sources/test_mongo.py::test_simple_ssl[cache-True]": {
38-
"reason": "errors upstream"
59+
"reason": "KNOWN errors upstream"
3960
},
4061
"test_dictionaries_all_layouts_separate_sources/test_mongo.py::test_simple_ssl[direct-True]":{
41-
"reason": "errors upstream"
62+
"reason": "KNOWN errors upstream"
4263
},
4364
"test_dictionaries_all_layouts_separate_sources/test_mongo.py::test_simple_ssl[flat-True]":{
44-
"reason": "errors upstream"
65+
"reason": "KNOWN errors upstream"
4566
},
4667
"test_dictionaries_all_layouts_separate_sources/test_mongo.py::test_simple_ssl[hashed-True]":{
47-
"reason": "errors upstream"
68+
"reason": "KNOWN errors upstream"
4869
},
4970
"test_dictionaries_all_layouts_separate_sources/test_mongo_uri.py::test_simple_ssl[flat-True]":{
50-
"reason": "errors upstream"
71+
"reason": "KNOWN errors upstream"
5172
},
5273
"test_storage_mongodb/test.py::test_secure_connection[True]":{
53-
"reason": "fails upstream"
74+
"reason": "KNOWN fails upstream"
5475
},
5576
"test_table_function_mongodb/test.py::test_secure_connection[True]":{
56-
"reason": "fails upstream"
77+
"reason": "KNOWN fails upstream"
78+
},
79+
"test_reload_certificate/test.py::test_chain_reload": {
80+
"reason": "NEEDSFIX - fixed upstream, needs backport"
81+
},
82+
"test_dictionaries_all_layouts_separate_sources/test_mongo.py::test_simple_ssl[flat-True]": {
83+
"reason": "INVESTIGATE"
84+
},
85+
"test_dictionaries_all_layouts_separate_sources/test_mongo.py::test_simple_ssl[hashed-True]": {
86+
"reason": "INVESTIGATE"
87+
},
88+
"test_dictionaries_all_layouts_separate_sources/test_mongo.py::test_simple_ssl[cache-True]": {
89+
"reason": "INVESTIGATE"
90+
},
91+
"test_quorum_inserts/test.py::test_insert_quorum_with_keeper_loss_connection": {
92+
"reason": "INVESTIGATE"
5793
}
5894
}

‎tests/ci/integration_tests_runner.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -938,7 +938,7 @@ def run_impl(self, repo_path, build_path):
938938
)
939939

940940
for fail_status in ("ERROR", "FAILED"):
941-
for failed_test in group_counters[fail_status]:
941+
for failed_test in group_counters[fail_status].copy():
942942
if failed_test in known_broken_tests.keys():
943943
fail_message = known_broken_tests[failed_test].get("message")
944944
if not fail_message:

0 commit comments

Comments
 (0)