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
8 changes: 4 additions & 4 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4495,7 +4495,7 @@ jobs:

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')}}
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(fromJson(needs.config_workflow.outputs.data).JOB_KV_DATA.ci_exclude_tags, 'regression')}}
uses: ./.github/workflows/regression.yml
secrets: inherit
with:
Expand All @@ -4504,10 +4504,10 @@ jobs:
arch: release
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
timeout_minutes: 300
workflow_config: ${{ needs.config_workflow.outputs.data.workflow_config }}
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')}}
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(fromJson(needs.config_workflow.outputs.data).JOB_KV_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:
Expand All @@ -4516,7 +4516,7 @@ jobs:
arch: aarch64
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
timeout_minutes: 300
workflow_config: ${{ needs.config_workflow.outputs.data.workflow_config }}
workflow_config: ${{ needs.config_workflow.outputs.data }}

SignRelease:
needs: [config_workflow, build_amd_release]
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4685,7 +4685,7 @@ jobs:

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')}}
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(fromJson(needs.config_workflow.outputs.data).JOB_KV_DATA.ci_exclude_tags, 'regression')}}
uses: ./.github/workflows/regression.yml
secrets: inherit
with:
Expand All @@ -4694,10 +4694,10 @@ jobs:
arch: release
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
timeout_minutes: 300
workflow_config: ${{ needs.config_workflow.outputs.data.workflow_config }}
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')}}
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(fromJson(needs.config_workflow.outputs.data).JOB_KV_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:
Expand All @@ -4706,7 +4706,7 @@ jobs:
arch: aarch64
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
timeout_minutes: 300
workflow_config: ${{ needs.config_workflow.outputs.data.workflow_config }}
workflow_config: ${{ needs.config_workflow.outputs.data }}

FinishCIReport:
if: ${{ !cancelled() }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/regression-reusable-suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:
--local
--collect-service-logs
--output ${{ inputs.output_format }}
--attr project="${GITHUB_REPOSITORY}" project.id="${GITHUB_REPOSITORY_ID}" user.name="${GITHUB_ACTOR}" version="${{ fromJson(inputs.workflow_config).custom_data.version.string }}" package="$clickhouse_path" repository="https://github.com/Altinity/clickhouse-regression" commit.hash="$(git rev-parse HEAD)" job.name=$GITHUB_JOB job.retry=$GITHUB_RUN_ATTEMPT job.url="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}" arch="$(uname -i)"
--attr project="${GITHUB_REPOSITORY}" project.id="${GITHUB_REPOSITORY_ID}" user.name="${GITHUB_ACTOR}" version="${{ fromJson(inputs.workflow_config).JOB_KV_DATA.version.string }}" package="$clickhouse_path" repository="https://github.com/Altinity/clickhouse-regression" commit.hash="$(git rev-parse HEAD)" job.name=$GITHUB_JOB job.retry=$GITHUB_RUN_ATTEMPT job.url="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}" arch="$(uname -i)"
--cicd
--log raw.log
${{ inputs.flags != 'none' && inputs.flags || ''}}
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
REPORTS_PATH=${{ runner.temp }}/reports_dir
mkdir -p $REPORTS_PATH
cat > $REPORTS_PATH/workflow_config.json << 'EOF'
${{ inputs.workflow_config }}
${{ toJson(fromJson(inputs.workflow_config).WORKFLOW_CONFIG) }}
EOF

python3 .github/get-deb-url.py --github-env $GITHUB_ENV --workflow-config $REPORTS_PATH/workflow_config.json --s3-base-url $S3_BASE_URL --pr-number $PR_NUMBER --branch-name ${{ github.ref_name }} --commit-hash ${{ inputs.build_sha || github.sha }} --binary
Expand Down
56 changes: 28 additions & 28 deletions .github/workflows/regression.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ env:
jobs:
Common:
if: |
fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'common')
fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs[0] == null ||
contains(fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs, 'common')
strategy:
fail-fast: false
matrix:
Expand All @@ -145,8 +145,8 @@ jobs:

AggregateFunctions:
if: |
fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'aggregate_functions')
fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs[0] == null ||
contains(fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs, 'aggregate_functions')
strategy:
fail-fast: false
matrix:
Expand All @@ -170,8 +170,8 @@ jobs:
secrets: inherit
Alter:
if: |
fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'alter')
fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs[0] == null ||
contains(fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs, 'alter')
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -202,8 +202,8 @@ jobs:

Benchmark:
if: |
fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'benchmark')
fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs[0] == null ||
contains(fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs, 'benchmark')
strategy:
fail-fast: false
matrix:
Expand All @@ -228,8 +228,8 @@ jobs:

ClickHouseKeeper:
if: |
fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'clickhouse_keeper')
fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs[0] == null ||
contains(fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs, 'clickhouse_keeper')
strategy:
fail-fast: false
matrix:
Expand All @@ -256,8 +256,8 @@ jobs:

Iceberg:
if: |
fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'iceberg')
fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs[0] == null ||
contains(fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs, 'iceberg')
strategy:
fail-fast: false
matrix:
Expand All @@ -281,8 +281,8 @@ jobs:
secrets: inherit
LDAP:
if: |
fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'ldap')
fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs[0] == null ||
contains(fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs, 'ldap')
strategy:
fail-fast: false
matrix:
Expand All @@ -305,8 +305,8 @@ jobs:

Parquet:
if: |
fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'parquet')
fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs[0] == null ||
contains(fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs, 'parquet')
uses: ./.github/workflows/regression-reusable-suite.yml
with:
ref: ${{ inputs.commit }}
Expand All @@ -325,8 +325,8 @@ jobs:

ParquetS3:
if: |
fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'parquet')
fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs[0] == null ||
contains(fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs, 'parquet')
strategy:
fail-fast: false
matrix:
Expand All @@ -351,8 +351,8 @@ jobs:

RBAC:
if: |
fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'rbac')
fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs[0] == null ||
contains(fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs, 'rbac')
strategy:
fail-fast: false
matrix:
Expand All @@ -376,8 +376,8 @@ jobs:
secrets: inherit
SSLServer:
if: |
fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'ssl_server')
fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs[0] == null ||
contains(fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs, 'ssl_server')
strategy:
fail-fast: false
matrix:
Expand All @@ -402,8 +402,8 @@ jobs:

S3:
if: |
fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 's3')
fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs[0] == null ||
contains(fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs, 's3')
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -434,8 +434,8 @@ jobs:

S3Export:
if: |
fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 's3')
fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs[0] == null ||
contains(fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs, 's3')
strategy:
fail-fast: false
matrix:
Expand All @@ -462,8 +462,8 @@ jobs:

TieredStorage:
if: |
fromJson(inputs.workflow_config).custom_data.ci_regression_jobs[0] == null ||
contains(fromJson(inputs.workflow_config).custom_data.ci_regression_jobs, 'tiered_storage')
fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs[0] == null ||
contains(fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs, 'tiered_storage')
strategy:
fail-fast: false
matrix:
Expand Down
8 changes: 4 additions & 4 deletions ci/praktika/yaml_additional_templates.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class AltinityWorkflowTemplates:
"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')}}
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(fromJson(needs.config_workflow.outputs.data).JOB_KV_DATA.ci_exclude_tags, 'regression')}}
uses: ./.github/workflows/regression.yml
secrets: inherit
with:
Expand All @@ -72,10 +72,10 @@ class AltinityWorkflowTemplates:
arch: release
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
timeout_minutes: 300
workflow_config: ${{ needs.config_workflow.outputs.data.workflow_config }}
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')}}
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(fromJson(needs.config_workflow.outputs.data).JOB_KV_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:
Expand All @@ -84,7 +84,7 @@ class AltinityWorkflowTemplates:
arch: aarch64
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
timeout_minutes: 300
workflow_config: ${{ needs.config_workflow.outputs.data.workflow_config }}
workflow_config: ${{ needs.config_workflow.outputs.data }}
""",
"SignRelease": r"""
SignRelease:
Expand Down
Loading