Skip to content

Commit 085d3d4

Browse files
strtgbbstrtgbb
committed
fix regression skipping
1 parent 8c6f30e commit 085d3d4

5 files changed

Lines changed: 47 additions & 47 deletions

File tree

‎.github/workflows/master.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4938,7 +4938,7 @@ jobs:
49384938
secrets: inherit
49394939
with:
49404940
docker_image: altinityinfra/clickhouse-server
4941-
version: ${{ fromJson(needs.config_workflow.outputs.data).JOB_KV_DATA.version.string }}
4941+
version: ${{ fromJson(needs.config_workflow.outputs.data).WORKFLOW_JOB_DATA.version.string }}
49424942
tag-suffix: ${{ matrix.suffix }}
49434943
GrypeScanKeeper:
49444944
needs: [config_workflow, docker_keeper_image]
@@ -4947,11 +4947,11 @@ jobs:
49474947
secrets: inherit
49484948
with:
49494949
docker_image: altinityinfra/clickhouse-keeper
4950-
version: ${{ fromJson(needs.config_workflow.outputs.data).JOB_KV_DATA.version.string }}
4950+
version: ${{ fromJson(needs.config_workflow.outputs.data).WORKFLOW_JOB_DATA.version.string }}
49514951

49524952
RegressionTestsRelease:
49534953
needs: [config_workflow, build_amd_binary, stateless_tests_amd_debug_parallel]
4954-
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(fromJson(needs.config_workflow.outputs.data).JOB_KV_DATA.ci_exclude_tags, 'regression')}}
4954+
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(fromJson(needs.config_workflow.outputs.data).WORKFLOW_JOB_DATA.ci_exclude_tags, 'regression')}}
49554955
uses: ./.github/workflows/regression.yml
49564956
secrets: inherit
49574957
with:
@@ -4963,7 +4963,7 @@ jobs:
49634963
workflow_config: ${{ needs.config_workflow.outputs.data }}
49644964
RegressionTestsAarch64:
49654965
needs: [config_workflow, build_arm_binary, stateless_tests_arm_binary_parallel]
4966-
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).JOB_KV_DATA.ci_exclude_tags, 'aarch64')}}
4966+
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(fromJson(needs.config_workflow.outputs.data).WORKFLOW_JOB_DATA.ci_exclude_tags, 'regression') && !contains(fromJson(needs.config_workflow.outputs.data).WORKFLOW_JOB_DATA.ci_exclude_tags, 'aarch64')}}
49674967
uses: ./.github/workflows/regression.yml
49684968
secrets: inherit
49694969
with:

‎.github/workflows/pull_request.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4733,7 +4733,7 @@ jobs:
47334733
secrets: inherit
47344734
with:
47354735
docker_image: altinityinfra/clickhouse-server
4736-
version: ${{ fromJson(needs.config_workflow.outputs.data).JOB_KV_DATA.version.string }}
4736+
version: ${{ fromJson(needs.config_workflow.outputs.data).WORKFLOW_JOB_DATA.version.string }}
47374737
tag-suffix: ${{ matrix.suffix }}
47384738
GrypeScanKeeper:
47394739
needs: [config_workflow, docker_keeper_image]
@@ -4742,11 +4742,11 @@ jobs:
47424742
secrets: inherit
47434743
with:
47444744
docker_image: altinityinfra/clickhouse-keeper
4745-
version: ${{ fromJson(needs.config_workflow.outputs.data).JOB_KV_DATA.version.string }}
4745+
version: ${{ fromJson(needs.config_workflow.outputs.data).WORKFLOW_JOB_DATA.version.string }}
47464746

47474747
RegressionTestsRelease:
47484748
needs: [config_workflow, build_amd_binary, stateless_tests_amd_debug_parallel]
4749-
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(fromJson(needs.config_workflow.outputs.data).JOB_KV_DATA.ci_exclude_tags, 'regression')}}
4749+
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(fromJson(needs.config_workflow.outputs.data).WORKFLOW_JOB_DATA.ci_exclude_tags, 'regression')}}
47504750
uses: ./.github/workflows/regression.yml
47514751
secrets: inherit
47524752
with:
@@ -4758,7 +4758,7 @@ jobs:
47584758
workflow_config: ${{ needs.config_workflow.outputs.data }}
47594759
RegressionTestsAarch64:
47604760
needs: [config_workflow, build_arm_binary, stateless_tests_arm_binary_parallel]
4761-
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).JOB_KV_DATA.ci_exclude_tags, 'aarch64')}}
4761+
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(fromJson(needs.config_workflow.outputs.data).WORKFLOW_JOB_DATA.ci_exclude_tags, 'regression') && !contains(fromJson(needs.config_workflow.outputs.data).WORKFLOW_JOB_DATA.ci_exclude_tags, 'aarch64')}}
47624762
uses: ./.github/workflows/regression.yml
47634763
secrets: inherit
47644764
with:

‎.github/workflows/regression-reusable-suite.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
--local
100100
--collect-service-logs
101101
--output ${{ inputs.output_format }}
102-
--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="$REPORT_JOB_NAME" job.retry=$GITHUB_RUN_ATTEMPT job.url="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}" arch="$(uname -i)"
102+
--attr project="${GITHUB_REPOSITORY}" project.id="${GITHUB_REPOSITORY_ID}" user.name="${GITHUB_ACTOR}" version="${{ fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.version.string }}" package="$clickhouse_path" repository="https://github.com/Altinity/clickhouse-regression" commit.hash="$(git rev-parse HEAD)" job.name="$REPORT_JOB_NAME" job.retry=$GITHUB_RUN_ATTEMPT job.url="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}" arch="$(uname -i)"
103103
--cicd
104104
--log raw.log
105105
${{ inputs.flags != 'none' && inputs.flags || ''}}

‎.github/workflows/regression.yml‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ env:
121121
jobs:
122122
Common:
123123
if: |
124-
fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs[0] == null ||
125-
contains(fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs, 'common')
124+
fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.ci_regression_jobs[0] == null ||
125+
contains(fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.ci_regression_jobs, 'common')
126126
strategy:
127127
fail-fast: false
128128
matrix:
@@ -145,8 +145,8 @@ jobs:
145145

146146
AggregateFunctions:
147147
if: |
148-
fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs[0] == null ||
149-
contains(fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs, 'aggregate_functions')
148+
fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.ci_regression_jobs[0] == null ||
149+
contains(fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.ci_regression_jobs, 'aggregate_functions')
150150
strategy:
151151
fail-fast: false
152152
matrix:
@@ -170,8 +170,8 @@ jobs:
170170
secrets: inherit
171171
Alter:
172172
if: |
173-
fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs[0] == null ||
174-
contains(fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs, 'alter')
173+
fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.ci_regression_jobs[0] == null ||
174+
contains(fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.ci_regression_jobs, 'alter')
175175
strategy:
176176
fail-fast: false
177177
matrix:
@@ -202,8 +202,8 @@ jobs:
202202

203203
Benchmark:
204204
if: |
205-
fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs[0] == null ||
206-
contains(fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs, 'benchmark')
205+
fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.ci_regression_jobs[0] == null ||
206+
contains(fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.ci_regression_jobs, 'benchmark')
207207
strategy:
208208
fail-fast: false
209209
matrix:
@@ -228,8 +228,8 @@ jobs:
228228

229229
ClickHouseKeeper:
230230
if: |
231-
fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs[0] == null ||
232-
contains(fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs, 'clickhouse_keeper')
231+
fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.ci_regression_jobs[0] == null ||
232+
contains(fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.ci_regression_jobs, 'clickhouse_keeper')
233233
strategy:
234234
fail-fast: false
235235
matrix:
@@ -256,8 +256,8 @@ jobs:
256256

257257
Iceberg:
258258
if: |
259-
fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs[0] == null ||
260-
contains(fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs, 'iceberg')
259+
fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.ci_regression_jobs[0] == null ||
260+
contains(fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.ci_regression_jobs, 'iceberg')
261261
strategy:
262262
fail-fast: false
263263
matrix:
@@ -281,8 +281,8 @@ jobs:
281281
secrets: inherit
282282
LDAP:
283283
if: |
284-
fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs[0] == null ||
285-
contains(fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs, 'ldap')
284+
fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.ci_regression_jobs[0] == null ||
285+
contains(fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.ci_regression_jobs, 'ldap')
286286
strategy:
287287
fail-fast: false
288288
matrix:
@@ -305,10 +305,10 @@ jobs:
305305

306306
OAuth:
307307
if: |
308-
contains(fromJson(inputs.workflow_config).JOB_KV_DATA.version.string, 'antalya') &&
308+
contains(fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.version.string, 'antalya') &&
309309
(
310-
fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs[0] == null ||
311-
contains(fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs, 'oauth')
310+
fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.ci_regression_jobs[0] == null ||
311+
contains(fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.ci_regression_jobs, 'oauth')
312312
)
313313
uses: ./.github/workflows/regression-reusable-suite.yml
314314
with:
@@ -328,8 +328,8 @@ jobs:
328328

329329
Parquet:
330330
if: |
331-
fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs[0] == null ||
332-
contains(fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs, 'parquet')
331+
fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.ci_regression_jobs[0] == null ||
332+
contains(fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.ci_regression_jobs, 'parquet')
333333
uses: ./.github/workflows/regression-reusable-suite.yml
334334
with:
335335
ref: ${{ inputs.commit }}
@@ -348,8 +348,8 @@ jobs:
348348

349349
ParquetS3:
350350
if: |
351-
fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs[0] == null ||
352-
contains(fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs, 'parquet')
351+
fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.ci_regression_jobs[0] == null ||
352+
contains(fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.ci_regression_jobs, 'parquet')
353353
strategy:
354354
fail-fast: false
355355
matrix:
@@ -374,8 +374,8 @@ jobs:
374374

375375
RBAC:
376376
if: |
377-
fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs[0] == null ||
378-
contains(fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs, 'rbac')
377+
fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.ci_regression_jobs[0] == null ||
378+
contains(fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.ci_regression_jobs, 'rbac')
379379
strategy:
380380
fail-fast: false
381381
matrix:
@@ -399,8 +399,8 @@ jobs:
399399
secrets: inherit
400400
SSLServer:
401401
if: |
402-
fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs[0] == null ||
403-
contains(fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs, 'ssl_server')
402+
fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.ci_regression_jobs[0] == null ||
403+
contains(fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.ci_regression_jobs, 'ssl_server')
404404
strategy:
405405
fail-fast: false
406406
matrix:
@@ -425,8 +425,8 @@ jobs:
425425

426426
S3:
427427
if: |
428-
fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs[0] == null ||
429-
contains(fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs, 's3')
428+
fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.ci_regression_jobs[0] == null ||
429+
contains(fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.ci_regression_jobs, 's3')
430430
strategy:
431431
fail-fast: false
432432
matrix:
@@ -457,8 +457,8 @@ jobs:
457457

458458
S3Export:
459459
if: |
460-
fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs[0] == null ||
461-
contains(fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs, 's3_export')
460+
fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.ci_regression_jobs[0] == null ||
461+
contains(fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.ci_regression_jobs, 's3_export')
462462
strategy:
463463
fail-fast: false
464464
matrix:
@@ -485,10 +485,10 @@ jobs:
485485

486486
Swarms:
487487
if: |
488-
contains(fromJson(inputs.workflow_config).JOB_KV_DATA.version.string, 'antalya') &&
488+
contains(fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.version.string, 'antalya') &&
489489
(
490-
fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs[0] == null ||
491-
contains(fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs, 'swarms')
490+
fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.ci_regression_jobs[0] == null ||
491+
contains(fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.ci_regression_jobs, 'swarms')
492492
)
493493
uses: ./.github/workflows/regression-reusable-suite.yml
494494
with:
@@ -508,8 +508,8 @@ jobs:
508508

509509
TieredStorage:
510510
if: |
511-
fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs[0] == null ||
512-
contains(fromJson(inputs.workflow_config).JOB_KV_DATA.ci_regression_jobs, 'tiered_storage')
511+
fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.ci_regression_jobs[0] == null ||
512+
contains(fromJson(inputs.workflow_config).WORKFLOW_JOB_DATA.ci_regression_jobs, 'tiered_storage')
513513
strategy:
514514
fail-fast: false
515515
matrix:

‎ci/praktika/yaml_additional_templates.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class AltinityWorkflowTemplates:
4949
secrets: inherit
5050
with:
5151
docker_image: altinityinfra/clickhouse-server
52-
version: ${{ fromJson(needs.config_workflow.outputs.data).JOB_KV_DATA.version.string }}
52+
version: ${{ fromJson(needs.config_workflow.outputs.data).WORKFLOW_JOB_DATA.version.string }}
5353
tag-suffix: ${{ matrix.suffix }}
5454
GrypeScanKeeper:
5555
needs: [config_workflow, docker_keeper_image]
@@ -58,12 +58,12 @@ class AltinityWorkflowTemplates:
5858
secrets: inherit
5959
with:
6060
docker_image: altinityinfra/clickhouse-keeper
61-
version: ${{ fromJson(needs.config_workflow.outputs.data).JOB_KV_DATA.version.string }}
61+
version: ${{ fromJson(needs.config_workflow.outputs.data).WORKFLOW_JOB_DATA.version.string }}
6262
""",
6363
"Regression": r"""
6464
RegressionTestsRelease:
6565
needs: [config_workflow, build_amd_binary, stateless_tests_amd_debug_parallel]
66-
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(fromJson(needs.config_workflow.outputs.data).JOB_KV_DATA.ci_exclude_tags, 'regression')}}
66+
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(fromJson(needs.config_workflow.outputs.data).WORKFLOW_JOB_DATA.ci_exclude_tags, 'regression')}}
6767
uses: ./.github/workflows/regression.yml
6868
secrets: inherit
6969
with:
@@ -75,7 +75,7 @@ class AltinityWorkflowTemplates:
7575
workflow_config: ${{ needs.config_workflow.outputs.data }}
7676
RegressionTestsAarch64:
7777
needs: [config_workflow, build_arm_binary, stateless_tests_arm_binary_parallel]
78-
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).JOB_KV_DATA.ci_exclude_tags, 'aarch64')}}
78+
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(fromJson(needs.config_workflow.outputs.data).WORKFLOW_JOB_DATA.ci_exclude_tags, 'regression') && !contains(fromJson(needs.config_workflow.outputs.data).WORKFLOW_JOB_DATA.ci_exclude_tags, 'aarch64')}}
7979
uses: ./.github/workflows/regression.yml
8080
secrets: inherit
8181
with:

0 commit comments

Comments
 (0)