Skip to content

Commit b664256

Browse files
authored
Merge pull request #419 from Altinity/customizations/24.3.5
24.3.5 Pre-release PR
2 parents fe54cea + dc7c588 commit b664256

File tree

142 files changed

+1745
-527
lines changed

Some content is hidden

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

142 files changed

+1745
-527
lines changed

Diff for: .github/actions/docker_setup/action.yml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Docker setup
2+
description: Setup docker
3+
inputs:
4+
nested_job:
5+
description: the fuse for unintended use inside of the reusable callable jobs
6+
default: true
7+
type: boolean
8+
runs:
9+
using: "composite"
10+
steps:
11+
- name: Docker IPv6 configuration
12+
shell: bash
13+
run: |
14+
# make sure docker uses proper IPv6 config
15+
sudo touch /etc/docker/daemon.json
16+
sudo chown ubuntu:ubuntu /etc/docker/daemon.json
17+
sudo cat <<EOT > /etc/docker/daemon.json
18+
{
19+
"ipv6": true,
20+
"fixed-cidr-v6": "2001:3984:3989::/64"
21+
}
22+
EOT
23+
sudo chown root:root /etc/docker/daemon.json
24+
sudo systemctl restart docker
25+
sudo systemctl status docker
26+
- name: Docker info
27+
shell: bash
28+
run: |
29+
docker info

Diff for: .github/retry.sh

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#!/bin/bash
2+
# Execute command until exitcode is 0 or
3+
# maximum number of retries is reached
4+
# Example:
5+
# ./retry <retries> <delay> <command>
6+
retries=$1
7+
delay=$2
8+
command="${@:3}"
9+
exitcode=0
10+
try=0
11+
until [ "$try" -ge $retries ]
12+
do
13+
echo "$command"
14+
eval "$command"
15+
exitcode=$?
16+
if [ $exitcode -eq 0 ]; then
17+
break
18+
fi
19+
try=$((try+1))
20+
sleep $2
21+
done
22+
exit $exitcode

Diff for: .github/workflows/pull_request.yml

+10-15
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ on: # yamllint disable-line rule:truthy
1717

1818
jobs:
1919
RunConfig:
20-
runs-on: [self-hosted, style-checker-aarch64]
20+
runs-on: [self-hosted, altinity-on-demand, altinity-type-cax41, altinity-in-hel1, altinity-image-arm-app-docker-ce]
2121
outputs:
2222
data: ${{ steps.runconfig.outputs.CI_DATA }}
2323
steps:
2424
- name: DebugInfo
2525
uses: hmarr/debug-action@f7318c783045ac39ed9bb497e22ce835fdafbfe6
2626
- name: Check out repository code
27-
uses: ClickHouse/checkout@v1
27+
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f
2828
with:
2929
clear-repository: true # to ensure correct digests
3030
fetch-depth: 0 # to get version
@@ -75,25 +75,20 @@ jobs:
7575
test_name: Style check
7676
runner_type: style-checker
7777
run_command: |
78-
python3 style_check.py
78+
python3 style_check.py --no-push
7979
data: ${{ needs.RunConfig.outputs.data }}
80-
secrets:
81-
secret_envs: |
82-
ROBOT_CLICKHOUSE_SSH_KEY<<RCSK
83-
${{secrets.ROBOT_CLICKHOUSE_SSH_KEY}}
84-
RCSK
8580
FastTest:
8681
needs: [RunConfig, BuildDockers]
8782
if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).jobs_data.jobs_to_do, 'Fast test') }}
8883
uses: ./.github/workflows/reusable_test.yml
8984
with:
9085
test_name: Fast test
91-
runner_type: builder
86+
runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-app-docker-ce
9287
data: ${{ needs.RunConfig.outputs.data }}
9388
run_command: |
9489
python3 fast_test_check.py
9590
96-
################################# Main statges #################################
91+
################################# Main stages #################################
9792
# for main CI chain
9893
#
9994
Builds_1:
@@ -140,7 +135,7 @@ jobs:
140135
uses: ./.github/workflows/reusable_test.yml
141136
with:
142137
test_name: ClickHouse build check
143-
runner_type: style-checker-aarch64
138+
runner_type: altinity-on-demand, altinity-type-cax41, altinity-in-hel1, altinity-image-arm-app-docker-ce
144139
data: ${{ needs.RunConfig.outputs.data }}
145140
Builds_2_Report:
146141
# run report check for failed builds to indicate the CI error
@@ -151,18 +146,18 @@ jobs:
151146
uses: ./.github/workflows/reusable_test.yml
152147
with:
153148
test_name: ClickHouse special build check
154-
runner_type: style-checker-aarch64
149+
runner_type: altinity-on-demand, altinity-type-cax41, altinity-in-hel1, altinity-image-arm-app-docker-ce
155150
data: ${{ needs.RunConfig.outputs.data }}
156151

157152
################################# Stage Final #################################
158153
#
159154
FinishCheck:
160155
if: ${{ !failure() && !cancelled() }}
161156
needs: [Tests_1, Tests_2]
162-
runs-on: [self-hosted, style-checker]
157+
runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx41, altinity-in-ash, altinity-image-x86-app-docker-ce]
163158
steps:
164159
- name: Check out repository code
165-
uses: ClickHouse/checkout@v1
160+
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f
166161
- name: Finish label
167162
run: |
168163
cd "$GITHUB_WORKSPACE/tests/ci"
@@ -186,5 +181,5 @@ jobs:
186181
uses: ./.github/workflows/reusable_test.yml
187182
with:
188183
test_name: ClickHouse Keeper Jepsen
189-
runner_type: style-checker
184+
runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-app-docker-ce
190185
data: ${{ needs.RunConfig.outputs.data }}

0 commit comments

Comments
 (0)