Skip to content
Merged
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/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
28 changes: 27 additions & 1 deletion ci/praktika/yaml_additional_templates.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')}}
Expand All @@ -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:
Expand Down
5 changes: 3 additions & 2 deletions ci/praktika/yaml_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 += (
Expand Down
2 changes: 1 addition & 1 deletion ci/workflows/pull_request.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading