Skip to content

Commit be111d0

Browse files
zvonandzvonand
authored
Merge pull request #1085 from Altinity/customizations/24.8.14
24.8.14 Stable Pre-release PR
2 parents 1681701 + fd0fddb commit be111d0

File tree

133 files changed

+2196
-851
lines changed

Some content is hidden

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

133 files changed

+2196
-851
lines changed

‎.github/workflows/docker_test_images.yml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ name: Build docker images
1010
description: set latest tag for resulting multiarch manifest
1111
required: false
1212
type: boolean
13-
default: false
13+
default: false
1414
secrets:
1515
secret_envs:
1616
description: if given, it's passed to the environments
@@ -26,10 +26,14 @@ env:
2626
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
2727
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
2828
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
29+
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
30+
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
31+
ROBOT_TOKEN: ${{ secrets.GITHUB_TOKEN }}
32+
2933

3034
jobs:
3135
DockerBuildAarch64:
32-
runs-on: [self-hosted, altinity-on-demand, altinity-type-cax41, altinity-image-arm-snapshot-22.04-arm, altinity-startup-snapshot, altinity-setup-none]
36+
runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
3337
if: |
3438
!failure() && !cancelled() && toJson(fromJson(inputs.data).docker_data.missing_aarch64) != '[]'
3539
steps:
@@ -44,7 +48,7 @@ jobs:
4448
--image-tags '${{ toJson(fromJson(inputs.data).docker_data.images) }}' \
4549
--missing-images '${{ toJson(fromJson(inputs.data).docker_data.missing_aarch64) }}'
4650
DockerBuildAmd64:
47-
runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-image-x86-snapshot-22.04-amd, altinity-startup-snapshot, altinity-setup-none]
51+
runs-on: [self-hosted, altinity-on-demand, altinity-style-checker]
4852
if: |
4953
!failure() && !cancelled() && toJson(fromJson(inputs.data).docker_data.missing_amd64) != '[]'
5054
steps:
@@ -60,7 +64,7 @@ jobs:
6064
--missing-images '${{ toJson(fromJson(inputs.data).docker_data.missing_amd64) }}'
6165
DockerMultiArchManifest:
6266
needs: [DockerBuildAmd64, DockerBuildAarch64]
63-
runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-image-x86-snapshot-22.04-amd, altinity-startup-snapshot, altinity-setup-none]
67+
runs-on: [self-hosted, altinity-on-demand, altinity-style-checker]
6468
if: |
6569
!failure() && !cancelled() && (toJson(fromJson(inputs.data).docker_data.missing_multi) != '[]' || inputs.set_latest)
6670
steps:

‎.github/workflows/grype_scan.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
TAG_SUFFIX: ${{ inputs.tag-suffix }}
6262
SPECIFIED_VERSION: ${{ inputs.version }}
6363
run: |
64-
python3 ./tests/ci/version_helper.py | tee /tmp/version_info
64+
python3 ./tests/ci/version_helper.py | grep = | grep -v , | tee /tmp/version_info
6565
source /tmp/version_info
6666
if [ -z "$SPECIFIED_VERSION" ]; then
6767
VERSION=$CLICKHOUSE_VERSION_STRING

‎.github/workflows/regression.yml‎

Lines changed: 170 additions & 23 deletions
Large diffs are not rendered by default.

‎.github/workflows/release_branches.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ jobs:
492492
secrets: inherit
493493
with:
494494
test_name: Integration tests (aarch64)
495-
runner_type: altinity-on-demand, altinity-type-cax41, altinity-image-arm-snapshot-22.04-arm, altinity-startup-snapshot, altinity-setup-none
495+
runner_type: altinity-on-demand, altinity-func-tester-aarch64
496496
data: ${{ needs.RunConfig.outputs.data }}
497497
#############################################################################################
498498
####################################### AST FUZZERS #########################################
@@ -504,7 +504,7 @@ jobs:
504504
secrets: inherit
505505
with:
506506
test_name: AST fuzzer (asan)
507-
runner_type: altinity-on-demand, altinity-type-cpx51, altinity-image-x86-snapshot-22.04-amd, altinity-startup-snapshot, altinity-setup-none
507+
runner_type: altinity-on-demand, altinity-func-tester
508508
data: ${{ needs.RunConfig.outputs.data }}
509509
ASTFuzzerTsan:
510510
needs: [RunConfig, BuilderDebTsan]
@@ -513,7 +513,7 @@ jobs:
513513
secrets: inherit
514514
with:
515515
test_name: AST fuzzer (tsan)
516-
runner_type: altinity-on-demand, altinity-type-cpx51, altinity-image-x86-snapshot-22.04-amd, altinity-startup-snapshot, altinity-setup-none
516+
runner_type: altinity-on-demand, altinity-func-tester
517517
data: ${{ needs.RunConfig.outputs.data }}
518518
ASTFuzzerMsan:
519519
needs: [RunConfig, BuilderDebMsan]
@@ -522,7 +522,7 @@ jobs:
522522
secrets: inherit
523523
with:
524524
test_name: AST fuzzer (msan)
525-
runner_type: altinity-on-demand, altinity-type-cpx51, altinity-image-x86-snapshot-22.04-amd, altinity-startup-snapshot, altinity-setup-none
525+
runner_type: altinity-on-demand, altinity-func-tester
526526
data: ${{ needs.RunConfig.outputs.data }}
527527
ASTFuzzerUBsan:
528528
needs: [RunConfig, BuilderDebUBsan]
@@ -531,7 +531,7 @@ jobs:
531531
secrets: inherit
532532
with:
533533
test_name: AST fuzzer (ubsan)
534-
runner_type: altinity-on-demand, altinity-type-cpx51, altinity-image-x86-snapshot-22.04-amd, altinity-startup-snapshot, altinity-setup-none
534+
runner_type: altinity-on-demand, altinity-func-tester
535535
data: ${{ needs.RunConfig.outputs.data }}
536536
ASTFuzzerDebug:
537537
needs: [RunConfig, BuilderDebDebug]
@@ -540,7 +540,7 @@ jobs:
540540
secrets: inherit
541541
with:
542542
test_name: AST fuzzer (debug)
543-
runner_type: altinity-on-demand, altinity-type-cpx51, altinity-image-x86-snapshot-22.04-amd, altinity-startup-snapshot, altinity-setup-none
543+
runner_type: altinity-on-demand, altinity-func-tester
544544
data: ${{ needs.RunConfig.outputs.data }}
545545
#############################################################################################
546546
##################################### REGRESSION TESTS ######################################
@@ -551,8 +551,8 @@ jobs:
551551
uses: ./.github/workflows/regression.yml
552552
secrets: inherit
553553
with:
554-
runner_type: altinity-on-demand, altinity-type-cpx51, altinity-image-x86-app-docker-ce, altinity-setup-regression
555-
commit: e3c00be97a045aa04e9d1a6ec50cc64f4c387b70
554+
runner_type: altinity-on-demand, altinity-regression-tester
555+
commit: fc19ce3a7322a10ab791de755c950a56744a12e7
556556
arch: release
557557
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
558558
timeout_minutes: 300
@@ -562,8 +562,8 @@ jobs:
562562
uses: ./.github/workflows/regression.yml
563563
secrets: inherit
564564
with:
565-
runner_type: altinity-on-demand, altinity-type-cax41, altinity-image-arm-app-docker-ce, altinity-setup-regression
566-
commit: e3c00be97a045aa04e9d1a6ec50cc64f4c387b70
565+
runner_type: altinity-on-demand, altinity-regression-tester-aarch64
566+
commit: fc19ce3a7322a10ab791de755c950a56744a12e7
567567
arch: aarch64
568568
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
569569
timeout_minutes: 300

‎.github/workflows/reusable_build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
if: ${{ contains(fromJson(inputs.data).jobs_data.jobs_to_do, inputs.build_name) || inputs.force }}
5959
env:
6060
GITHUB_JOB_OVERRIDDEN: Build-${{inputs.build_name}}
61-
runs-on: [self-hosted, altinity-type-ccx53, altinity-on-demand, altinity-image-x86-snapshot-22.04-amd, altinity-startup-snapshot, altinity-setup-none]
61+
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
6262
steps:
6363
- name: Check out repository code
6464
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@
365365
url = https://github.com/ClickHouse/rust_vendor.git
366366
[submodule "contrib/openssl"]
367367
path = contrib/openssl
368-
url = https://github.com/ClickHouse/openssl.git
368+
url = https://github.com/Altinity/openssl.git
369369
[submodule "contrib/double-conversion"]
370370
path = contrib/double-conversion
371371
url = https://github.com/ClickHouse/double-conversion.git

‎contrib/openssl‎

‎docker/keeper/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RUN arch=${TARGETARCH:-amd64} \
1212
&& ln -s "${rarch}-linux-gnu" /lib/linux-gnu
1313

1414

15-
FROM alpine:3.21.3
15+
FROM alpine:3.21.5
1616

1717
ENV LANG=en_US.UTF-8 \
1818
LANGUAGE=en_US:en \

‎docker/server/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,4 +177,4 @@ EOSQL
177177

178178
## License
179179

180-
View [license information](https://github.com/ClickHouse/ClickHouse/blob/master/LICENSE) for the software contained in this image.
180+
View [license information](https://github.com/Altinity/ClickHouse/blob/antalya/LICENSE) for the software contained in this image.

‎docker/server/README.src/github-repo‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://github.com/ClickHouse/ClickHouse
1+
https://github.com/Altinity/ClickHouse/

0 commit comments

Comments
 (0)