Skip to content

Commit d01c8c9

Browse files
arthurpassosarthurpassos
authored
Merge branch 'antalya-25.8' into fp_antalya_25_8_export_mt_part
2 parents b9ca655 + 67a38d1 commit d01c8c9

File tree

285 files changed

+9031
-2243
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

285 files changed

+9031
-2243
lines changed

‎.github/workflows/backport_branches.yml‎

Lines changed: 0 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -1490,126 +1490,3 @@ jobs:
14901490
else
14911491
python3 -m praktika run 'Finish Workflow' --workflow "BackportPR" --ci |& tee ./ci/tmp/job.log
14921492
fi
1493-
1494-
##########################################################################################
1495-
##################################### ALTINITY JOBS ######################################
1496-
##########################################################################################
1497-
GrypeScanServer:
1498-
needs: [config_workflow, docker_server_image]
1499-
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VyIHNlcnZlciBpbWFnZQ==') }}
1500-
strategy:
1501-
fail-fast: false
1502-
matrix:
1503-
suffix: ['', '-alpine']
1504-
uses: ./.github/workflows/grype_scan.yml
1505-
secrets: inherit
1506-
with:
1507-
docker_image: altinityinfra/clickhouse-server
1508-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
1509-
tag-suffix: ${{ matrix.suffix }}
1510-
GrypeScanKeeper:
1511-
needs: [config_workflow, docker_keeper_image]
1512-
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VyIGtlZXBlciBpbWFnZQ==') }}
1513-
uses: ./.github/workflows/grype_scan.yml
1514-
secrets: inherit
1515-
with:
1516-
docker_image: altinityinfra/clickhouse-keeper
1517-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
1518-
1519-
RegressionTestsRelease:
1520-
needs: [config_workflow, build_amd_release]
1521-
if: ${{ !failure() && !cancelled() && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression')}}
1522-
uses: ./.github/workflows/regression.yml
1523-
secrets: inherit
1524-
with:
1525-
runner_type: altinity-on-demand, altinity-regression-tester
1526-
commit: 4a3f046ac47b1f1286c82d734251541711314645
1527-
arch: release
1528-
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
1529-
timeout_minutes: 300
1530-
workflow_config: ${{ needs.config_workflow.outputs.data }}
1531-
RegressionTestsAarch64:
1532-
needs: [config_workflow, build_arm_release]
1533-
if: ${{ !failure() && !cancelled() && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_aarch64')}}
1534-
uses: ./.github/workflows/regression.yml
1535-
secrets: inherit
1536-
with:
1537-
runner_type: altinity-on-demand, altinity-regression-tester-aarch64
1538-
commit: 4a3f046ac47b1f1286c82d734251541711314645
1539-
arch: aarch64
1540-
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
1541-
timeout_minutes: 300
1542-
workflow_config: ${{ needs.config_workflow.outputs.data }}
1543-
1544-
SignRelease:
1545-
needs: [config_workflow, build_amd_release]
1546-
if: ${{ !failure() && !cancelled() }}
1547-
uses: ./.github/workflows/reusable_sign.yml
1548-
secrets: inherit
1549-
with:
1550-
test_name: Sign release
1551-
runner_type: altinity-style-checker
1552-
data: ${{ needs.config_workflow.outputs.data }}
1553-
SignAarch64:
1554-
needs: [config_workflow, build_arm_release]
1555-
if: ${{ !failure() && !cancelled() }}
1556-
uses: ./.github/workflows/reusable_sign.yml
1557-
secrets: inherit
1558-
with:
1559-
test_name: Sign aarch64
1560-
runner_type: altinity-style-checker-aarch64
1561-
data: ${{ needs.config_workflow.outputs.data }}
1562-
1563-
FinishCIReport:
1564-
if: ${{ !cancelled() }}
1565-
needs:
1566-
- config_workflow
1567-
- dockers_build_amd
1568-
- dockers_build_arm
1569-
- build_amd_debug
1570-
- build_amd_release
1571-
- build_amd_asan
1572-
- build_amd_tsan
1573-
- build_arm_release
1574-
- build_amd_darwin
1575-
- build_arm_darwin
1576-
- docker_server_image
1577-
- docker_keeper_image
1578-
- install_packages_amd_debug
1579-
- compatibility_check_release
1580-
- compatibility_check_aarch64
1581-
- stateless_tests_amd_asan_distributed_plan_parallel_1_2
1582-
- stateless_tests_amd_asan_distributed_plan_parallel_2_2
1583-
- stateless_tests_amd_asan_distributed_plan_sequential
1584-
- stress_test_amd_tsan
1585-
- integration_tests_amd_asan_old_analyzer_1_6
1586-
- integration_tests_amd_asan_old_analyzer_2_6
1587-
- integration_tests_amd_asan_old_analyzer_3_6
1588-
- integration_tests_amd_asan_old_analyzer_4_6
1589-
- integration_tests_amd_asan_old_analyzer_5_6
1590-
- integration_tests_amd_asan_old_analyzer_6_6
1591-
- integration_tests_amd_tsan_1_6
1592-
- integration_tests_amd_tsan_2_6
1593-
- integration_tests_amd_tsan_3_6
1594-
- integration_tests_amd_tsan_4_6
1595-
- integration_tests_amd_tsan_5_6
1596-
- integration_tests_amd_tsan_6_6
1597-
- finish_workflow
1598-
- SignRelease
1599-
- SignAarch64
1600-
- RegressionTestsRelease
1601-
- RegressionTestsAarch64
1602-
- GrypeScanServer
1603-
- GrypeScanKeeper
1604-
runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
1605-
steps:
1606-
- name: Check out repository code
1607-
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
1608-
with:
1609-
clear-repository: true
1610-
- name: Finalize workflow report
1611-
if: ${{ !cancelled() }}
1612-
uses: ./.github/actions/create_workflow_report
1613-
with:
1614-
workflow_config: ${{ needs.config_workflow.outputs.data }}
1615-
final: true

‎.github/workflows/grype_scan.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ jobs:
113113
' result.json >> $GITHUB_STEP_SUMMARY
114114
fi
115115
116-
HIGH_COUNT=$(jq -r '.matches | map(.vulnerability.severity) | map(select(. == "High")) | length' result.json)
117-
CRITICAL_COUNT=$(jq -r '.matches | map(.vulnerability.severity) | map(select(. == "Critical")) | length' result.json)
116+
HIGH_COUNT=$(jq -r '.matches | map(.vulnerability) | unique_by(.id) | map(.severity) | map(select(. == "High")) | length' result.json)
117+
CRITICAL_COUNT=$(jq -r '.matches | map(.vulnerability) | unique_by(.id) | map(.severity) | map(select(. == "Critical")) | length' result.json)
118118
TOTAL_HIGH_CRITICAL=$((HIGH_COUNT + CRITICAL_COUNT))
119119
echo "total_high_critical=$TOTAL_HIGH_CRITICAL" >> $GITHUB_OUTPUT
120120

‎.github/workflows/master.yml‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4148,6 +4148,7 @@ jobs:
41484148
##########################################################################################
41494149
##################################### ALTINITY JOBS ######################################
41504150
##########################################################################################
4151+
41514152
GrypeScanServer:
41524153
needs: [config_workflow, docker_server_image]
41534154
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VyIHNlcnZlciBpbWFnZQ==') }}
@@ -4171,25 +4172,25 @@ jobs:
41714172
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
41724173

41734174
RegressionTestsRelease:
4174-
needs: [config_workflow, build_amd_release]
4175-
if: ${{ !failure() && !cancelled() && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression')}}
4175+
needs: [config_workflow, build_amd_binary]
4176+
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).custom_data.ci_exclude_tags, 'regression')}}
41764177
uses: ./.github/workflows/regression.yml
41774178
secrets: inherit
41784179
with:
41794180
runner_type: altinity-on-demand, altinity-regression-tester
4180-
commit: 4a3f046ac47b1f1286c82d734251541711314645
4181+
commit: 3fbe58a0ebe8fa5f97b7f36c45a2a69b1d3b6568
41814182
arch: release
41824183
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
41834184
timeout_minutes: 300
41844185
workflow_config: ${{ needs.config_workflow.outputs.data }}
41854186
RegressionTestsAarch64:
4186-
needs: [config_workflow, build_arm_release]
4187-
if: ${{ !failure() && !cancelled() && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_aarch64')}}
4187+
needs: [config_workflow, build_arm_binary]
4188+
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).custom_data.ci_exclude_tags, 'regression') && !contains(fromJson(needs.config_workflow.outputs.data).custom_data.ci_exclude_tags, 'aarch64')}}
41884189
uses: ./.github/workflows/regression.yml
41894190
secrets: inherit
41904191
with:
41914192
runner_type: altinity-on-demand, altinity-regression-tester-aarch64
4192-
commit: 4a3f046ac47b1f1286c82d734251541711314645
4193+
commit: 3fbe58a0ebe8fa5f97b7f36c45a2a69b1d3b6568
41934194
arch: aarch64
41944195
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
41954196
timeout_minutes: 300
@@ -4308,12 +4309,12 @@ jobs:
43084309
- clickbench_arm_release
43094310
- sqltest
43104311
- finish_workflow
4311-
- SignRelease
4312-
- SignAarch64
4313-
- RegressionTestsRelease
4314-
- RegressionTestsAarch64
43154312
- GrypeScanServer
43164313
- GrypeScanKeeper
4314+
- RegressionTestsRelease
4315+
- RegressionTestsAarch64
4316+
- SignRelease
4317+
- SignAarch64
43174318
runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
43184319
steps:
43194320
- name: Check out repository code

‎.github/workflows/pull_request.yml‎

Lines changed: 9 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4104,6 +4104,7 @@ jobs:
41044104
##########################################################################################
41054105
##################################### ALTINITY JOBS ######################################
41064106
##########################################################################################
4107+
41074108
GrypeScanServer:
41084109
needs: [config_workflow, docker_server_image]
41094110
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RG9ja2VyIHNlcnZlciBpbWFnZQ==') }}
@@ -4127,49 +4128,30 @@ jobs:
41274128
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
41284129

41294130
RegressionTestsRelease:
4130-
needs: [config_workflow, build_amd_release]
4131-
if: ${{ !failure() && !cancelled() && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression')}}
4131+
needs: [config_workflow, build_amd_binary]
4132+
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).custom_data.ci_exclude_tags, 'regression')}}
41324133
uses: ./.github/workflows/regression.yml
41334134
secrets: inherit
41344135
with:
41354136
runner_type: altinity-on-demand, altinity-regression-tester
4136-
commit: 4a3f046ac47b1f1286c82d734251541711314645
4137+
commit: 3fbe58a0ebe8fa5f97b7f36c45a2a69b1d3b6568
41374138
arch: release
41384139
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
41394140
timeout_minutes: 300
41404141
workflow_config: ${{ needs.config_workflow.outputs.data }}
41414142
RegressionTestsAarch64:
4142-
needs: [config_workflow, build_arm_release]
4143-
if: ${{ !failure() && !cancelled() && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_aarch64')}}
4143+
needs: [config_workflow, build_arm_binary]
4144+
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).custom_data.ci_exclude_tags, 'regression') && !contains(fromJson(needs.config_workflow.outputs.data).custom_data.ci_exclude_tags, 'aarch64')}}
41444145
uses: ./.github/workflows/regression.yml
41454146
secrets: inherit
41464147
with:
41474148
runner_type: altinity-on-demand, altinity-regression-tester-aarch64
4148-
commit: 4a3f046ac47b1f1286c82d734251541711314645
4149+
commit: 3fbe58a0ebe8fa5f97b7f36c45a2a69b1d3b6568
41494150
arch: aarch64
41504151
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
41514152
timeout_minutes: 300
41524153
workflow_config: ${{ needs.config_workflow.outputs.data }}
41534154

4154-
SignRelease:
4155-
needs: [config_workflow, build_amd_release]
4156-
if: ${{ !failure() && !cancelled() }}
4157-
uses: ./.github/workflows/reusable_sign.yml
4158-
secrets: inherit
4159-
with:
4160-
test_name: Sign release
4161-
runner_type: altinity-style-checker
4162-
data: ${{ needs.config_workflow.outputs.data }}
4163-
SignAarch64:
4164-
needs: [config_workflow, build_arm_release]
4165-
if: ${{ !failure() && !cancelled() }}
4166-
uses: ./.github/workflows/reusable_sign.yml
4167-
secrets: inherit
4168-
with:
4169-
test_name: Sign aarch64
4170-
runner_type: altinity-style-checker-aarch64
4171-
data: ${{ needs.config_workflow.outputs.data }}
4172-
41734155
FinishCIReport:
41744156
if: ${{ !cancelled() }}
41754157
needs:
@@ -4263,12 +4245,10 @@ jobs:
42634245
- buzzhouse_amd_msan
42644246
- buzzhouse_amd_ubsan
42654247
- finish_workflow
4266-
- SignRelease
4267-
- SignAarch64
4268-
- RegressionTestsRelease
4269-
- RegressionTestsAarch64
42704248
- GrypeScanServer
42714249
- GrypeScanKeeper
4250+
- RegressionTestsRelease
4251+
- RegressionTestsAarch64
42724252
runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
42734253
steps:
42744254
- name: Check out repository code

0 commit comments

Comments
 (0)