Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/backport_branches.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1507,7 +1507,7 @@ jobs:

RegressionTestsRelease:
needs: [config_workflow, build_amd_release]
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression')}}
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression')}}
uses: ./.github/workflows/regression.yml
secrets: inherit
with:
Expand All @@ -1519,7 +1519,7 @@ jobs:
workflow_config: ${{ needs.config_workflow.outputs.data }}
RegressionTestsAarch64:
needs: [config_workflow, build_arm_release]
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_aarch64')}}
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_aarch64')}}
uses: ./.github/workflows/regression.yml
secrets: inherit
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4610,7 +4610,7 @@ jobs:

RegressionTestsRelease:
needs: [config_workflow, build_amd_release]
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression')}}
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression')}}
uses: ./.github/workflows/regression.yml
secrets: inherit
with:
Expand All @@ -4622,7 +4622,7 @@ jobs:
workflow_config: ${{ needs.config_workflow.outputs.data }}
RegressionTestsAarch64:
needs: [config_workflow, build_arm_release]
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_aarch64')}}
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_aarch64')}}
uses: ./.github/workflows/regression.yml
secrets: inherit
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/merge_queue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ jobs:

RegressionTestsRelease:
needs: [config_workflow, build_amd_release]
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression')}}
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression')}}
uses: ./.github/workflows/regression.yml
secrets: inherit
with:
Expand All @@ -388,7 +388,7 @@ jobs:
workflow_config: ${{ needs.config_workflow.outputs.data }}
RegressionTestsAarch64:
needs: [config_workflow, build_arm_release]
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_aarch64')}}
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_aarch64')}}
uses: ./.github/workflows/regression.yml
secrets: inherit
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly_fuzzers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ jobs:

RegressionTestsRelease:
needs: [config_workflow, build_amd_release]
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression')}}
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression')}}
uses: ./.github/workflows/regression.yml
secrets: inherit
with:
Expand All @@ -286,7 +286,7 @@ jobs:
workflow_config: ${{ needs.config_workflow.outputs.data }}
RegressionTestsAarch64:
needs: [config_workflow, build_arm_release]
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_aarch64')}}
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_aarch64')}}
uses: ./.github/workflows/regression.yml
secrets: inherit
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly_jepsen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ jobs:

RegressionTestsRelease:
needs: [config_workflow, build_amd_release]
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression')}}
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression')}}
uses: ./.github/workflows/regression.yml
secrets: inherit
with:
Expand All @@ -286,7 +286,7 @@ jobs:
workflow_config: ${{ needs.config_workflow.outputs.data }}
RegressionTestsAarch64:
needs: [config_workflow, build_arm_release]
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_aarch64')}}
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_aarch64')}}
uses: ./.github/workflows/regression.yml
secrets: inherit
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly_statistics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ jobs:

RegressionTestsRelease:
needs: [config_workflow, build_amd_release]
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression')}}
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression')}}
uses: ./.github/workflows/regression.yml
secrets: inherit
with:
Expand All @@ -146,7 +146,7 @@ jobs:
workflow_config: ${{ needs.config_workflow.outputs.data }}
RegressionTestsAarch64:
needs: [config_workflow, build_arm_release]
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_aarch64')}}
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_aarch64')}}
uses: ./.github/workflows/regression.yml
secrets: inherit
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3937,7 +3937,7 @@ jobs:

RegressionTestsRelease:
needs: [config_workflow, build_amd_release]
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression')}}
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression')}}
uses: ./.github/workflows/regression.yml
secrets: inherit
with:
Expand All @@ -3949,7 +3949,7 @@ jobs:
workflow_config: ${{ needs.config_workflow.outputs.data }}
RegressionTestsAarch64:
needs: [config_workflow, build_arm_release]
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_aarch64')}}
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_aarch64')}}
uses: ./.github/workflows/regression.yml
secrets: inherit
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release_branches.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1865,7 +1865,7 @@ jobs:

RegressionTestsRelease:
needs: [config_workflow, build_amd_release]
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression')}}
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression')}}
uses: ./.github/workflows/regression.yml
secrets: inherit
with:
Expand All @@ -1877,7 +1877,7 @@ jobs:
workflow_config: ${{ needs.config_workflow.outputs.data }}
RegressionTestsAarch64:
needs: [config_workflow, build_arm_release]
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_aarch64')}}
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_aarch64')}}
uses: ./.github/workflows/regression.yml
secrets: inherit
with:
Expand Down
5 changes: 5 additions & 0 deletions ci/defs/job_configs.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"./tests/clickhouse-test",
"./tests/config",
"./tests/*.txt",
"./tests/broken_tests.json",
],
),
result_name_for_cidb="Tests",
Expand Down Expand Up @@ -588,6 +589,7 @@ class JobConfigs:
"./tests/ci/integration_tests_runner.py",
"./tests/integration/",
"./docker",
"./tests/broken_tests.json",
],
),
).parametrize(
Expand All @@ -610,6 +612,7 @@ class JobConfigs:
"./tests/ci/integration_tests_runner.py",
"./tests/integration/",
"./docker",
"./tests/broken_tests.json",
],
),
).parametrize(
Expand Down Expand Up @@ -645,6 +648,7 @@ class JobConfigs:
"./tests/ci/integration_tests_runner.py",
"./tests/integration/",
"./docker",
"./tests/broken_tests.json",
],
),
allow_merge_on_failure=True,
Expand All @@ -670,6 +674,7 @@ class JobConfigs:
"./tests/ci/integration_tests_runner.py",
"./tests/integration/",
"./docker",
"./tests/broken_tests.json",
],
),
requires=["Build (amd_asan)"],
Expand Down
39 changes: 38 additions & 1 deletion ci/jobs/scripts/functional_tests_results.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import dataclasses
import json
import os
import traceback
from typing import List

Expand Down Expand Up @@ -28,6 +30,16 @@
# out.writerow(status)


def get_broken_tests_list() -> dict:
file_path = "tests/broken_tests.json"
if not os.path.isfile(file_path) or os.path.getsize(file_path) == 0:
return {}

with open(file_path, "r", encoding="utf-8") as skip_list_file:
skip_list_tests = json.load(skip_list_file)
return skip_list_tests


class FTResultsProcessor:
@dataclasses.dataclass
class Summary:
Expand All @@ -36,6 +48,7 @@ class Summary:
unknown: int
failed: int
success: int
broken: int
test_results: List[Result]
hung: bool = False
server_died: bool = False
Expand All @@ -54,13 +67,16 @@ def _process_test_output(self):
unknown = 0
failed = 0
success = 0
broken = 0
hung = False
server_died = False
retries = False
success_finish = False
test_results = []
test_end = True

known_broken_tests = get_broken_tests_list()

with open(self.tests_output_file, "r", encoding="utf-8") as test_file:
for line in test_file:
original_line = line
Expand Down Expand Up @@ -133,6 +149,26 @@ def _process_test_output(self):
info="".join(test[3])[:16384],
)
)

if test[1] == "FAIL":
broken_message = None
if test[0] in known_broken_tests.keys():
if known_broken_tests[test[0]].get("message"):
if (
known_broken_tests[test[0]]["message"]
in test_results_[-1].info
):
broken_message = f"\nMarked as broken, matched message: '{known_broken_tests[test[0]]['message']}'"
else:
broken_message = f"\nMarked as broken, no message specified"

if broken_message:
broken += 1
failed -= 1
test_results_[-1].set_status(Result.StatusExtended.BROKEN)
test_results_[-1].set_label(Result.Label.BROKEN)
test_results_[-1].info += broken_message

except Exception as e:
print(f"ERROR: Failed to parse test results: [{test}]")
traceback.print_exc()
Expand All @@ -153,6 +189,7 @@ def _process_test_output(self):
unknown=unknown,
failed=failed,
success=success,
broken=broken,
test_results=test_results,
hung=hung,
server_died=server_died,
Expand Down Expand Up @@ -220,7 +257,7 @@ def run(self):
pass

if not info:
info = f"Failed: {s.failed}, Passed: {s.success}, Skipped: {s.skipped}"
info = f"Failed: {s.failed}, Passed: {s.success}, Skipped: {s.skipped}, Broken: {s.broken}"

# TODO: !!!
# def test_result_comparator(item):
Expand Down
2 changes: 1 addition & 1 deletion ci/praktika/job.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class Config:

allow_merge_on_failure: bool = False

enable_commit_status: bool = False
enable_commit_status: bool = True

# If a job Result contains multiple sub-results, and only a specific sub-result should be sent to CIDB, set its name here.
result_name_for_cidb: str = ""
Expand Down
2 changes: 2 additions & 0 deletions ci/praktika/result.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ class StatusExtended:
OK = "OK"
FAIL = "FAIL"
SKIPPED = "SKIPPED"
BROKEN = "BROKEN"

class Label:
REQUIRED = "required"
Expand Down Expand Up @@ -170,6 +171,7 @@ def is_ok(self):
Result.Status.SUCCESS,
Result.StatusExtended.OK,
Result.StatusExtended.SKIPPED,
Result.StatusExtended.BROKEN,
)

def is_error(self):
Expand Down
4 changes: 2 additions & 2 deletions ci/praktika/yaml_additional_templates.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class AltinityWorkflowTemplates:

RegressionTestsRelease:
needs: [config_workflow, build_amd_release]
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression')}}
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression')}}
uses: ./.github/workflows/regression.yml
secrets: inherit
with:
Expand All @@ -71,7 +71,7 @@ class AltinityWorkflowTemplates:
workflow_config: ${{ needs.config_workflow.outputs.data }}
RegressionTestsAarch64:
needs: [config_workflow, build_arm_release]
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_aarch64')}}
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_aarch64')}}
uses: ./.github/workflows/regression.yml
secrets: inherit
with:
Expand Down
Loading
Loading