From d77a7af7a1ee0ff08109ff03e8eb80937d81d385 Mon Sep 17 00:00:00 2001 From: strtgbb <146047128+strtgbb@users.noreply.github.com> Date: Thu, 27 Aug 2026 16:35:26 -0400 Subject: [PATCH] Remove stateless debug dependency in regression on masterci workflow This solution is a bit kludgy, but it's simple and not a hot path --- .github/workflows/master.yml | 4 ++-- ci/praktika/yaml_additional_templates.py | 28 +++++++++++++++++++++++- ci/praktika/yaml_generator.py | 5 +++-- ci/workflows/pull_request.py | 2 +- 4 files changed, 33 insertions(+), 6 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index b5dfcf5ba65b..fc49ce2ad074 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -6574,7 +6574,7 @@ jobs: version: ${{ fromJson(needs.config_workflow.outputs.data).workflow_config.custom_data.version.string }} RegressionTestsRelease: - needs: [config_workflow, build_amd_binary, stateless_tests_amd_debug_parallel] + needs: [config_workflow, build_amd_binary] if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(fromJson(needs.config_workflow.outputs.data).workflow_config.custom_data.ci_exclude_tags, 'regression')}} uses: ./.github/workflows/regression.yml secrets: inherit @@ -6586,7 +6586,7 @@ jobs: timeout_minutes: 210 workflow_config: ${{ needs.config_workflow.outputs.data }} RegressionTestsAarch64: - needs: [config_workflow, build_arm_binary, stateless_tests_arm_binary_parallel] + needs: [config_workflow, build_arm_binary] if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(fromJson(needs.config_workflow.outputs.data).workflow_config.custom_data.ci_exclude_tags, 'regression') && !contains(fromJson(needs.config_workflow.outputs.data).workflow_config.custom_data.ci_exclude_tags, 'aarch64')}} uses: ./.github/workflows/regression.yml secrets: inherit diff --git a/ci/praktika/yaml_additional_templates.py b/ci/praktika/yaml_additional_templates.py index ac694f442a16..06c35e425a9f 100644 --- a/ci/praktika/yaml_additional_templates.py +++ b/ci/praktika/yaml_additional_templates.py @@ -60,7 +60,7 @@ class AltinityWorkflowTemplates: docker_image: altinityinfra/clickhouse-keeper version: ${{ fromJson(needs.config_workflow.outputs.data).workflow_config.custom_data.version.string }} """, - "Regression": r""" + "RegressionPR": r""" RegressionTestsRelease: needs: [config_workflow, build_amd_binary, stateless_tests_amd_debug_parallel] if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(fromJson(needs.config_workflow.outputs.data).workflow_config.custom_data.ci_exclude_tags, 'regression')}} @@ -85,6 +85,32 @@ class AltinityWorkflowTemplates: build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout_minutes: 210 workflow_config: ${{ needs.config_workflow.outputs.data }} +""", + "Regression": r""" + RegressionTestsRelease: + needs: [config_workflow, build_amd_binary] + if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(fromJson(needs.config_workflow.outputs.data).workflow_config.custom_data.ci_exclude_tags, 'regression')}} + uses: ./.github/workflows/regression.yml + secrets: inherit + with: + runner_type: altinity-regression-tester + commit: {REGRESSION_HASH} + arch: release + build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} + timeout_minutes: 210 + workflow_config: ${{ needs.config_workflow.outputs.data }} + RegressionTestsAarch64: + needs: [config_workflow, build_arm_binary] + if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(fromJson(needs.config_workflow.outputs.data).workflow_config.custom_data.ci_exclude_tags, 'regression') && !contains(fromJson(needs.config_workflow.outputs.data).workflow_config.custom_data.ci_exclude_tags, 'aarch64')}} + uses: ./.github/workflows/regression.yml + secrets: inherit + with: + runner_type: altinity-regression-tester-aarch64 + commit: {REGRESSION_HASH} + arch: aarch64 + build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} + timeout_minutes: 210 + workflow_config: ${{ needs.config_workflow.outputs.data }} """, "CIReport": r""" FinishCIReport: diff --git a/ci/praktika/yaml_generator.py b/ci/praktika/yaml_generator.py index bf7de5a77fe7..ca3bd6c412b9 100644 --- a/ci/praktika/yaml_generator.py +++ b/ci/praktika/yaml_generator.py @@ -610,8 +610,9 @@ def _all_needs(job_name: str) -> set: if "GrypeScan" in self.workflow_config.additional_jobs: res += AltinityWorkflowTemplates.ALTINITY_JOBS["GrypeScan"] ALL_JOBS += "\n - GrypeScanServer\n - GrypeScanKeeper" - if "Regression" in self.workflow_config.additional_jobs: - res += AltinityWorkflowTemplates.ALTINITY_JOBS["Regression"].replace( + if "Regression" in self.workflow_config.additional_jobs or "RegressionPR" in self.workflow_config.additional_jobs: + regression_template = AltinityWorkflowTemplates.ALTINITY_JOBS["Regression"] if "Regression" in self.workflow_config.additional_jobs else AltinityWorkflowTemplates.ALTINITY_JOBS["RegressionPR"] + res += regression_template.replace( "{REGRESSION_HASH}", AltinityWorkflowTemplates.REGRESSION_HASH ) ALL_JOBS += ( diff --git a/ci/workflows/pull_request.py b/ci/workflows/pull_request.py index 9646b2f58ed9..2288cc8fde0f 100644 --- a/ci/workflows/pull_request.py +++ b/ci/workflows/pull_request.py @@ -163,7 +163,7 @@ *JobConfigs.toolchain_build_jobs, AltinityJobConfigs.source_upload_job, ], - additional_jobs=["GrypeScan", "Regression", "CIReport"], + additional_jobs=["GrypeScan", "RegressionPR", "CIReport"], artifacts=[ *ArtifactConfigs.unittests_binaries, *ArtifactConfigs.clickhouse_binaries,