Skip to content

Commit 9bcaa90

Browse files
EnmkEnmk
authored
Merge pull request #518 from Altinity/24.8.5_altinity_infrastructure
24.8.5 Attempt to do builds and test on Altinity infrastructure
2 parents 8c4cb00 + e98d325 commit 9bcaa90

File tree

153 files changed

+2022
-888
lines changed

Some content is hidden

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

153 files changed

+2022
-888
lines changed

‎.github/actionlint.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ self-hosted-runner:
44
- func-tester
55
- func-tester-aarch64
66
- fuzzer-unit-tester
7-
- stress-tester
7+
- altinity-on-demand
8+
- altinity-type-cpx51
9+
- altinity-in-ash
10+
- altinity-image-x86-system-ubuntu-22.04
811
- style-checker
912
- style-checker-aarch64
1013
- release-maker

‎.github/actions/docker_setup/action.yml‎

Lines changed: 29 additions & 0 deletions
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

‎.github/retry.sh‎

Lines changed: 22 additions & 0 deletions
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

‎.github/workflows/backport_branches.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
data: ${{ steps.runconfig.outputs.CI_DATA }}
2323
steps:
2424
- name: Check out repository code
25-
uses: ClickHouse/checkout@v1
25+
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f
2626
with:
2727
clear-repository: true # to ensure correct digests
2828
fetch-depth: 0 # to get version
@@ -164,7 +164,7 @@ jobs:
164164
runs-on: [self-hosted, style-checker-aarch64]
165165
steps:
166166
- name: Check out repository code
167-
uses: ClickHouse/checkout@v1
167+
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f
168168
- name: Download reports
169169
run: |
170170
python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --infile ${{ toJson(needs.RunConfig.outputs.data) }} --pre --job-name Builds
@@ -194,7 +194,7 @@ jobs:
194194
uses: ./.github/workflows/reusable_test.yml
195195
with:
196196
test_name: Install packages (aarch64)
197-
runner_type: style-checker-aarch64
197+
runner_type: altinity-on-demand, altinity-type-cax41, altinity-in-hel1, altinity-image-arm-app-docker-ce
198198
data: ${{ needs.RunConfig.outputs.data }}
199199
run_command: |
200200
python3 install_check.py "$CHECK_NAME"
@@ -229,7 +229,7 @@ jobs:
229229
uses: ./.github/workflows/reusable_test.yml
230230
with:
231231
test_name: Stress test (tsan)
232-
runner_type: stress-tester
232+
runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
233233
data: ${{ needs.RunConfig.outputs.data }}
234234
#############################################################################################
235235
############################# INTEGRATION TESTS #############################################
@@ -240,7 +240,7 @@ jobs:
240240
uses: ./.github/workflows/reusable_test.yml
241241
with:
242242
test_name: Integration tests (release)
243-
runner_type: stress-tester
243+
runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
244244
data: ${{ needs.RunConfig.outputs.data }}
245245
FinishCheck:
246246
if: ${{ !cancelled() }}
@@ -256,7 +256,7 @@ jobs:
256256
runs-on: [self-hosted, style-checker]
257257
steps:
258258
- name: Check out repository code
259-
uses: ClickHouse/checkout@v1
259+
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f
260260
with:
261261
clear-repository: true
262262
- name: Finish label

‎.github/workflows/cherry_pick.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
REPO_TEAM=core
2929
EOF
3030
- name: Check out repository code
31-
uses: ClickHouse/checkout@v1
31+
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f
3232
with:
3333
clear-repository: true
3434
token: ${{secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN}}

‎.github/workflows/create_release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
runs-on: [self-hosted, release-maker]
3535
steps:
3636
- name: Check out repository code
37-
uses: ClickHouse/checkout@v1
37+
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f
3838
with:
3939
token: ${{secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN}}
4040
fetch-depth: 0

‎.github/workflows/docker_test_images.yml‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,31 @@ 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
14+
secrets:
15+
secret_envs:
16+
description: if given, it's passed to the environments
17+
required: false
18+
AWS_SECRET_ACCESS_KEY:
19+
description: the access key to the aws param store.
20+
required: true
21+
AWS_ACCESS_KEY_ID:
22+
description: the access key id to the aws param store.
23+
required: true
24+
25+
env:
26+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
27+
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
28+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
1429

1530
jobs:
1631
DockerBuildAarch64:
17-
runs-on: [self-hosted, style-checker-aarch64]
32+
runs-on: [self-hosted, altinity-on-demand, altinity-type-cax41, altinity-image-arm-snapshot-22.04-arm, altinity-startup-snapshot, altinity-setup-none]
1833
if: |
1934
!failure() && !cancelled() && toJson(fromJson(inputs.data).docker_data.missing_aarch64) != '[]'
2035
steps:
2136
- name: Check out repository code
22-
uses: ClickHouse/checkout@v1
37+
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
2338
with:
2439
ref: ${{ fromJson(inputs.data).git_ref }}
2540
- name: Build images
@@ -29,12 +44,12 @@ jobs:
2944
--image-tags '${{ toJson(fromJson(inputs.data).docker_data.images) }}' \
3045
--missing-images '${{ toJson(fromJson(inputs.data).docker_data.missing_aarch64) }}'
3146
DockerBuildAmd64:
32-
runs-on: [self-hosted, style-checker]
47+
runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-image-x86-snapshot-22.04-amd, altinity-startup-snapshot, altinity-setup-none]
3348
if: |
3449
!failure() && !cancelled() && toJson(fromJson(inputs.data).docker_data.missing_amd64) != '[]'
3550
steps:
3651
- name: Check out repository code
37-
uses: ClickHouse/checkout@v1
52+
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
3853
with:
3954
ref: ${{ fromJson(inputs.data).git_ref }}
4055
- name: Build images
@@ -45,12 +60,12 @@ jobs:
4560
--missing-images '${{ toJson(fromJson(inputs.data).docker_data.missing_amd64) }}'
4661
DockerMultiArchManifest:
4762
needs: [DockerBuildAmd64, DockerBuildAarch64]
48-
runs-on: [self-hosted, style-checker]
63+
runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-image-x86-snapshot-22.04-amd, altinity-startup-snapshot, altinity-setup-none]
4964
if: |
5065
!failure() && !cancelled() && (toJson(fromJson(inputs.data).docker_data.missing_multi) != '[]' || inputs.set_latest)
5166
steps:
5267
- name: Check out repository code
53-
uses: ClickHouse/checkout@v1
68+
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
5469
with:
5570
ref: ${{ fromJson(inputs.data).git_ref }}
5671
- name: Build images

‎.github/workflows/jepsen.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
data: ${{ steps.runconfig.outputs.CI_DATA }}
1717
steps:
1818
- name: Check out repository code
19-
uses: ClickHouse/checkout@v1
19+
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f
2020
with:
2121
clear-repository: true # to ensure correct digests
2222
fetch-depth: 0 # to get version
@@ -43,7 +43,7 @@ jobs:
4343
uses: ./.github/workflows/reusable_test.yml
4444
with:
4545
test_name: ClickHouse Keeper Jepsen
46-
runner_type: style-checker-aarch64
46+
runner_type: altinity-on-demand, altinity-type-cax41, altinity-in-hel1, altinity-image-arm-app-docker-ce
4747
data: ${{ needs.RunConfig.outputs.data }}
4848
run_command: |
4949
python3 jepsen_check.py keeper
@@ -53,7 +53,7 @@ jobs:
5353
uses: ./.github/workflows/reusable_test.yml
5454
with:
5555
test_name: ClickHouse Server Jepsen
56-
runner_type: style-checker-aarch64
56+
runner_type: altinity-on-demand, altinity-type-cax41, altinity-in-hel1, altinity-image-arm-app-docker-ce
5757
data: ${{ needs.RunConfig.outputs.data }}
5858
run_command: |
5959
python3 jepsen_check.py server
@@ -63,7 +63,7 @@ jobs:
6363
runs-on: [self-hosted, style-checker-aarch64]
6464
steps:
6565
- name: Check out repository code
66-
uses: ClickHouse/checkout@v1
66+
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f
6767
- name: Check Workflow results
6868
if: ${{ !cancelled() }}
6969
run: |

‎.github/workflows/master.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
data: ${{ steps.runconfig.outputs.CI_DATA }}
1717
steps:
1818
- name: Check out repository code
19-
uses: ClickHouse/checkout@v1
19+
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f
2020
with:
2121
clear-repository: true # to ensure correct digests
2222
fetch-depth: 0 # to get version
@@ -118,7 +118,7 @@ jobs:
118118
uses: ./.github/workflows/reusable_test.yml
119119
with:
120120
test_name: Builds
121-
runner_type: style-checker-aarch64
121+
runner_type: altinity-on-demand, altinity-type-cax41, altinity-in-hel1, altinity-image-arm-app-docker-ce
122122
data: ${{ needs.RunConfig.outputs.data }}
123123

124124
FinishCheck:
@@ -127,7 +127,7 @@ jobs:
127127
runs-on: [self-hosted, style-checker-aarch64]
128128
steps:
129129
- name: Check out repository code
130-
uses: ClickHouse/checkout@v1
130+
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f
131131
- name: Finish label
132132
run: |
133133
cd "$GITHUB_WORKSPACE/tests/ci"

‎.github/workflows/merge_queue.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
data: ${{ steps.runconfig.outputs.CI_DATA }}
1616
steps:
1717
- name: Check out repository code
18-
uses: ClickHouse/checkout@v1
18+
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f
1919
with:
2020
clear-repository: true # to ensure correct digests
2121
fetch-depth: 0 # to get a version
@@ -56,7 +56,7 @@ jobs:
5656
uses: ./.github/workflows/reusable_test.yml
5757
with:
5858
test_name: Style check
59-
runner_type: style-checker-aarch64
59+
runner_type: altinity-on-demand, altinity-type-cax41, altinity-in-hel1, altinity-image-arm-app-docker-ce
6060
run_command: |
6161
python3 style_check.py
6262
data: ${{ needs.RunConfig.outputs.data }}
@@ -99,7 +99,7 @@ jobs:
9999
runs-on: [self-hosted, style-checker-aarch64]
100100
steps:
101101
- name: Check out repository code
102-
uses: ClickHouse/checkout@v1
102+
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f
103103
- name: Check and set merge status
104104
if: ${{ needs.StyleCheck.result == 'success' }}
105105
run: |

0 commit comments

Comments
 (0)