Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

24.8.7 Pre-release #526

Open
wants to merge 40 commits into
base: releases/24.8.7
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
850ab74
Attempt to do builds and test on Altinity infrastructure
Enmk Nov 6, 2024
99f9574
Updated runner labels
Enmk Nov 6, 2024
bfdd85a
Fixed docker images from clickhouse to altinityinfra
Enmk Nov 7, 2024
5392ec4
Added runner_type to SIGN_RELEASE and SIGN_AARCH64
Enmk Nov 7, 2024
6bc559b
Revert "Updated runner labels"
Enmk Nov 7, 2024
8931869
Fixed ci/cd self-tests
Enmk Nov 7, 2024
fe3ef6b
Fixed docker images names
Enmk Nov 7, 2024
2818298
Runner labels
Enmk Nov 7, 2024
fffe7f5
Update release_branches.yml
MyroTk Nov 7, 2024
a69517d
Update docker runner labels
MyroTk Nov 7, 2024
ed54227
Update docker_test_images.yml
MyroTk Nov 7, 2024
c4f6481
Add aws access secrets to docker job
MyroTk Nov 7, 2024
d6d501e
Merge pull request #519 from Altinity/24.8.5_pipeline_fix
Enmk Nov 7, 2024
f25a2ab
Using `ubuntu-latest` for `RunConfig`
Enmk Nov 7, 2024
beea951
Add secrets to docker env
MyroTk Nov 7, 2024
12cd34c
Update RunConfig runner labels
MyroTk Nov 7, 2024
7908b79
added missing `self-hosted` to DockerBuildAarch64
Enmk Nov 7, 2024
e960b64
Merge pull request #520 from Altinity/24.8.5_docker_secrets
Enmk Nov 8, 2024
a1c0b0d
Using clickhouse/cctools:0d6b90a7a490 in Dockerfiles
Enmk Nov 8, 2024
1d9803d
Less strict version dependencies for `pip install`
Enmk Nov 10, 2024
77ff91b
Not building docker image altinityinfra/kerberized-hadoop
Enmk Nov 11, 2024
0967db1
Removed altinityinfra/kerberized-hadoop from other places too
Enmk Nov 11, 2024
d6d24cd
Removed comments from JSON document
Enmk Nov 11, 2024
37eae3e
24.8 FinishCheck label
MyroTk Nov 13, 2024
f0e4f63
Merge pull request #522 from Altinity/24.8_finishcheck_label
Enmk Nov 14, 2024
87a2f5b
Fix Builds_Report
MyroTk Nov 14, 2024
3fbc514
Merge pull request #523 from Altinity/24.8_builds_report
Enmk Nov 15, 2024
e98d325
proper commit of Altinity/checkout action
Enmk Nov 15, 2024
9bcaa90
Merge pull request #518 from Altinity/24.8.5_altinity_infrastructure
Enmk Nov 18, 2024
8efc429
Attempt to fix some integration tests
Enmk Oct 8, 2024
b28f6c3
Using bottle 0.13
Enmk Nov 18, 2024
644e924
Update regression.yml
MyroTk Nov 19, 2024
ccc46b8
Increase regression timeout
MyroTk Nov 20, 2024
0cdd467
Merge pull request #525 from Altinity/24.8.5_regression_fix
Enmk Nov 20, 2024
15b2bc2
Merge pull request #521 from Altinity/24.8_fix_tests
Enmk Nov 21, 2024
f9bab7a
Merge remote-tracking branch 'altinity/customizations/24.8.5' into cu…
Enmk Nov 21, 2024
f892f0e
Always push builds report
Enmk Nov 22, 2024
6fa22aa
Merge pull request #530 from Altinity/24.8_always_post_builds_report
Enmk Nov 22, 2024
25ee99b
Using Altinity's README.md
Enmk Nov 22, 2024
168e254
Added missing logos
Enmk Nov 22, 2024
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: 4 additions & 0 deletions .github/actionlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ self-hosted-runner:
- func-tester
- func-tester-aarch64
- fuzzer-unit-tester
- altinity-on-demand
- altinity-type-cpx51
- altinity-in-ash
- altinity-image-x86-system-ubuntu-22.04
- style-checker
- style-checker-aarch64
- release-maker
29 changes: 29 additions & 0 deletions .github/actions/docker_setup/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Docker setup
description: Setup docker
inputs:
nested_job:
description: the fuse for unintended use inside of the reusable callable jobs
default: true
type: boolean
runs:
using: "composite"
steps:
- name: Docker IPv6 configuration
shell: bash
run: |
# make sure docker uses proper IPv6 config
sudo touch /etc/docker/daemon.json
sudo chown ubuntu:ubuntu /etc/docker/daemon.json
sudo cat <<EOT > /etc/docker/daemon.json
{
"ipv6": true,
"fixed-cidr-v6": "2001:3984:3989::/64"
}
EOT
sudo chown root:root /etc/docker/daemon.json
sudo systemctl restart docker
sudo systemctl status docker
- name: Docker info
shell: bash
run: |
docker info
22 changes: 22 additions & 0 deletions .github/retry.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#!/bin/bash
# Execute command until exitcode is 0 or
# maximum number of retries is reached
# Example:
# ./retry <retries> <delay> <command>
retries=$1
delay=$2
command="${@:3}"
exitcode=0
try=0
until [ "$try" -ge $retries ]
do
echo "$command"
eval "$command"
exitcode=$?
if [ $exitcode -eq 0 ]; then
break
fi
try=$((try+1))
sleep $2
done
exit $exitcode
14 changes: 7 additions & 7 deletions .github/workflows/backport_branches.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
data: ${{ steps.runconfig.outputs.CI_DATA }}
steps:
- name: Check out repository code
uses: ClickHouse/checkout@v1
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f
with:
clear-repository: true # to ensure correct digests
fetch-depth: 0 # to get version
Expand Down Expand Up @@ -164,7 +164,7 @@ jobs:
runs-on: [self-hosted, style-checker-aarch64]
steps:
- name: Check out repository code
uses: ClickHouse/checkout@v1
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f
- name: Download reports
run: |
python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --infile ${{ toJson(needs.RunConfig.outputs.data) }} --pre --job-name Builds
Expand Down Expand Up @@ -194,7 +194,7 @@ jobs:
uses: ./.github/workflows/reusable_test.yml
with:
test_name: Install packages (aarch64)
runner_type: style-checker-aarch64
runner_type: altinity-on-demand, altinity-type-cax41, altinity-in-hel1, altinity-image-arm-app-docker-ce
data: ${{ needs.RunConfig.outputs.data }}
run_command: |
python3 install_check.py "$CHECK_NAME"
Expand Down Expand Up @@ -229,7 +229,7 @@ jobs:
uses: ./.github/workflows/reusable_test.yml
with:
test_name: Stress test (tsan)
runner_type: func-tester
runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
data: ${{ needs.RunConfig.outputs.data }}
#############################################################################################
############################# INTEGRATION TESTS #############################################
Expand All @@ -240,15 +240,15 @@ jobs:
uses: ./.github/workflows/reusable_test.yml
with:
test_name: Integration tests (asan, old analyzer)
runner_type: func-tester
runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
data: ${{ needs.RunConfig.outputs.data }}
IntegrationTestsTsan:
needs: [RunConfig, BuilderDebTsan]
if: ${{ !failure() && !cancelled() }}
uses: ./.github/workflows/reusable_test.yml
with:
test_name: Integration tests (tsan)
runner_type: func-tester
runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
data: ${{ needs.RunConfig.outputs.data }}
FinishCheck:
if: ${{ !cancelled() }}
Expand All @@ -265,7 +265,7 @@ jobs:
runs-on: [self-hosted, style-checker]
steps:
- name: Check out repository code
uses: ClickHouse/checkout@v1
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f
with:
clear-repository: true
- name: Finish label
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cherry_pick.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
REPO_TEAM=core
EOF
- name: Check out repository code
uses: ClickHouse/checkout@v1
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f
with:
clear-repository: true
token: ${{secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
runs-on: [self-hosted, release-maker]
steps:
- name: Check out repository code
uses: ClickHouse/checkout@v1
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f
with:
token: ${{secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN}}
fetch-depth: 0
Expand Down
29 changes: 22 additions & 7 deletions .github/workflows/docker_test_images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,31 @@ name: Build docker images
description: set latest tag for resulting multiarch manifest
required: false
type: boolean
default: false
default: false
secrets:
secret_envs:
description: if given, it's passed to the environments
required: false
AWS_SECRET_ACCESS_KEY:
description: the access key to the aws param store.
required: true
AWS_ACCESS_KEY_ID:
description: the access key id to the aws param store.
required: true

env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

jobs:
DockerBuildAarch64:
runs-on: [self-hosted, style-checker-aarch64]
runs-on: [self-hosted, altinity-on-demand, altinity-type-cax41, altinity-image-arm-snapshot-22.04-arm, altinity-startup-snapshot, altinity-setup-none]
if: |
!failure() && !cancelled() && toJson(fromJson(inputs.data).docker_data.missing_aarch64) != '[]'
steps:
- name: Check out repository code
uses: ClickHouse/checkout@v1
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
with:
ref: ${{ fromJson(inputs.data).git_ref }}
- name: Build images
Expand All @@ -29,12 +44,12 @@ jobs:
--image-tags '${{ toJson(fromJson(inputs.data).docker_data.images) }}' \
--missing-images '${{ toJson(fromJson(inputs.data).docker_data.missing_aarch64) }}'
DockerBuildAmd64:
runs-on: [self-hosted, style-checker]
runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-image-x86-snapshot-22.04-amd, altinity-startup-snapshot, altinity-setup-none]
if: |
!failure() && !cancelled() && toJson(fromJson(inputs.data).docker_data.missing_amd64) != '[]'
steps:
- name: Check out repository code
uses: ClickHouse/checkout@v1
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
with:
ref: ${{ fromJson(inputs.data).git_ref }}
- name: Build images
Expand All @@ -45,12 +60,12 @@ jobs:
--missing-images '${{ toJson(fromJson(inputs.data).docker_data.missing_amd64) }}'
DockerMultiArchManifest:
needs: [DockerBuildAmd64, DockerBuildAarch64]
runs-on: [self-hosted, style-checker]
runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-image-x86-snapshot-22.04-amd, altinity-startup-snapshot, altinity-setup-none]
if: |
!failure() && !cancelled() && (toJson(fromJson(inputs.data).docker_data.missing_multi) != '[]' || inputs.set_latest)
steps:
- name: Check out repository code
uses: ClickHouse/checkout@v1
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
with:
ref: ${{ fromJson(inputs.data).git_ref }}
- name: Build images
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/jepsen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
data: ${{ steps.runconfig.outputs.CI_DATA }}
steps:
- name: Check out repository code
uses: ClickHouse/checkout@v1
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f
with:
clear-repository: true # to ensure correct digests
fetch-depth: 0 # to get version
Expand All @@ -43,7 +43,7 @@ jobs:
uses: ./.github/workflows/reusable_test.yml
with:
test_name: ClickHouse Keeper Jepsen
runner_type: style-checker-aarch64
runner_type: altinity-on-demand, altinity-type-cax41, altinity-in-hel1, altinity-image-arm-app-docker-ce
data: ${{ needs.RunConfig.outputs.data }}
run_command: |
python3 jepsen_check.py keeper
Expand All @@ -53,7 +53,7 @@ jobs:
uses: ./.github/workflows/reusable_test.yml
with:
test_name: ClickHouse Server Jepsen
runner_type: style-checker-aarch64
runner_type: altinity-on-demand, altinity-type-cax41, altinity-in-hel1, altinity-image-arm-app-docker-ce
data: ${{ needs.RunConfig.outputs.data }}
run_command: |
python3 jepsen_check.py server
Expand All @@ -63,7 +63,7 @@ jobs:
runs-on: [self-hosted, style-checker-aarch64]
steps:
- name: Check out repository code
uses: ClickHouse/checkout@v1
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f
- name: Check Workflow results
if: ${{ !cancelled() }}
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
data: ${{ steps.runconfig.outputs.CI_DATA }}
steps:
- name: Check out repository code
uses: ClickHouse/checkout@v1
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f
with:
clear-repository: true # to ensure correct digests
fetch-depth: 0 # to get version
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
uses: ./.github/workflows/reusable_test.yml
with:
test_name: Builds
runner_type: style-checker-aarch64
runner_type: altinity-on-demand, altinity-type-cax41, altinity-in-hel1, altinity-image-arm-app-docker-ce
data: ${{ needs.RunConfig.outputs.data }}

FinishCheck:
Expand All @@ -127,7 +127,7 @@ jobs:
runs-on: [self-hosted, style-checker-aarch64]
steps:
- name: Check out repository code
uses: ClickHouse/checkout@v1
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f
- name: Finish label
run: |
cd "$GITHUB_WORKSPACE/tests/ci"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/merge_queue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
data: ${{ steps.runconfig.outputs.CI_DATA }}
steps:
- name: Check out repository code
uses: ClickHouse/checkout@v1
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f
with:
clear-repository: true # to ensure correct digests
fetch-depth: 0 # to get a version
Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
uses: ./.github/workflows/reusable_test.yml
with:
test_name: Style check
runner_type: style-checker-aarch64
runner_type: altinity-on-demand, altinity-type-cax41, altinity-in-hel1, altinity-image-arm-app-docker-ce
run_command: |
python3 style_check.py
data: ${{ needs.RunConfig.outputs.data }}
Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
runs-on: [self-hosted, style-checker-aarch64]
steps:
- name: Check out repository code
uses: ClickHouse/checkout@v1
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f
- name: Check and set merge status
if: ${{ needs.StyleCheck.result == 'success' }}
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
data: ${{ steps.runconfig.outputs.CI_DATA }}
steps:
- name: Check out repository code
uses: ClickHouse/checkout@v1
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f
with:
clear-repository: true # to ensure correct digests
fetch-depth: 0 # to get version
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
runs-on: [self-hosted, style-checker-aarch64]
steps:
- name: Check out repository code
uses: ClickHouse/checkout@v1
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f
- name: Check Workflow results
if: ${{ !cancelled() }}
run: |
Expand Down
25 changes: 10 additions & 15 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ concurrency:

jobs:
RunConfig:
runs-on: [self-hosted, style-checker-aarch64]
runs-on: [self-hosted, altinity-on-demand, altinity-type-cax41, altinity-in-hel1, altinity-image-arm-app-docker-ce]
outputs:
data: ${{ steps.runconfig.outputs.CI_DATA }}
steps:
- name: Check out repository code
uses: ClickHouse/checkout@v1
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f
with:
clear-repository: true # to ensure correct digests
fetch-depth: 0 # to get a version
Expand Down Expand Up @@ -77,22 +77,17 @@ jobs:
uses: ./.github/workflows/reusable_test.yml
with:
test_name: Style check
runner_type: style-checker-aarch64
runner_type: altinity-on-demand, altinity-type-cax41, altinity-in-hel1, altinity-image-arm-app-docker-ce
run_command: |
python3 style_check.py
python3 style_check.py --no-push
data: ${{ needs.RunConfig.outputs.data }}
secrets:
secret_envs: |
ROBOT_CLICKHOUSE_SSH_KEY<<RCSK
${{secrets.ROBOT_CLICKHOUSE_SSH_KEY}}
RCSK
FastTest:
needs: [RunConfig, BuildDockers, StyleCheck]
if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).jobs_data.jobs_to_do, 'Fast test') }}
uses: ./.github/workflows/reusable_test.yml
with:
test_name: Fast test
runner_type: builder
runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-app-docker-ce
data: ${{ needs.RunConfig.outputs.data }}
run_command: |
python3 fast_test_check.py
Expand Down Expand Up @@ -152,7 +147,7 @@ jobs:
uses: ./.github/workflows/reusable_test.yml
with:
test_name: Builds
runner_type: style-checker-aarch64
runner_type: altinity-on-demand, altinity-type-cax41, altinity-in-hel1, altinity-image-arm-app-docker-ce
data: ${{ needs.RunConfig.outputs.data }}

CheckReadyForMerge:
Expand All @@ -163,7 +158,7 @@ jobs:
runs-on: [self-hosted, style-checker-aarch64]
steps:
- name: Check out repository code
uses: ClickHouse/checkout@v1
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f
with:
filter: tree:0
- name: Check and set merge status
Expand All @@ -185,10 +180,10 @@ jobs:
FinishCheck:
if: ${{ !failure() && !cancelled() }}
needs: [RunConfig, BuildDockers, StyleCheck, FastTest, Builds_1, Builds_2, Builds_Report, Tests_1, Tests_2_ww, Tests_2]
runs-on: [self-hosted, style-checker-aarch64]
runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx41, altinity-in-ash, altinity-image-x86-app-docker-ce]
steps:
- name: Check out repository code
uses: ClickHouse/checkout@v1
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f
with:
filter: tree:0
- name: Finish label
Expand All @@ -211,5 +206,5 @@ jobs:
uses: ./.github/workflows/reusable_test.yml
with:
test_name: ClickHouse Keeper Jepsen
runner_type: style-checker-aarch64
runner_type: altinity-on-demand, altinity-type-cax41, altinity-in-hel1, altinity-image-arm-app-docker-ce
data: ${{ needs.RunConfig.outputs.data }}
Loading
Loading