Skip to content

Commit

Permalink
Merge pull request #377 from Altinity/customizations/23.8.11
Browse files Browse the repository at this point in the history
23.8.11 Pre-release
  • Loading branch information
Enmk authored Apr 28, 2024
2 parents 31879d2 + 75c599d commit 8e9be16
Show file tree
Hide file tree
Showing 128 changed files with 2,272 additions and 2,280 deletions.
38 changes: 38 additions & 0 deletions .github/actions/docker_setup/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
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
DOCKER_USERNAME:
description: username for the dockerhub login
required: true
type: string
DOCKER_PASSWORD:
description: password for the dockerhub login
required: true
type: string
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 login
shell: bash
run: |
docker login -u ${{ inputs.DOCKER_USERNAME }} -p ${{ inputs.DOCKER_PASSWORD }}
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
6 changes: 3 additions & 3 deletions .github/workflows/backport_branches.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,13 @@ jobs:
clear-repository: true
fetch-depth: 0 # It MUST BE THE SAME for all dependencies and the job itself
filter: tree:0
- name: Check docker clickhouse/clickhouse-server building
- name: Check docker altinityinfra/clickhouse-server building
run: |
cd "$GITHUB_WORKSPACE/tests/ci"
python3 docker_server.py --release-type head --no-push \
--image-repo clickhouse/clickhouse-server --image-path docker/server
--image-repo altinityinfra/clickhouse-server --image-path docker/server
python3 docker_server.py --release-type head --no-push \
--image-repo clickhouse/clickhouse-keeper --image-path docker/keeper
--image-repo altinityinfra/clickhouse-keeper --image-path docker/keeper
- name: Cleanup
if: always()
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cancel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on: # yamllint disable-line rule:truthy
- requested
jobs:
cancel:
runs-on: [self-hosted, style-checker]
runs-on: ubuntu-latest
steps:
- uses: styfle/[email protected]
with:
Expand Down
45 changes: 0 additions & 45 deletions .github/workflows/cherry_pick.yml

This file was deleted.

140 changes: 0 additions & 140 deletions .github/workflows/docs_check.yml

This file was deleted.

29 changes: 0 additions & 29 deletions .github/workflows/jepsen.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -233,13 +233,13 @@ jobs:
clear-repository: true
fetch-depth: 0 # It MUST BE THE SAME for all dependencies and the job itself
filter: tree:0
- name: Check docker clickhouse/clickhouse-server building
- name: Check docker altinityinfra/clickhouse-server building
run: |
cd "$GITHUB_WORKSPACE/tests/ci"
python3 docker_server.py --release-type head \
--image-repo clickhouse/clickhouse-server --image-path docker/server
--image-repo altinityinfra/clickhouse-server --image-path docker/server
python3 docker_server.py --release-type head \
--image-repo clickhouse/clickhouse-keeper --image-path docker/keeper
--image-repo altinityinfra/clickhouse-keeper --image-path docker/keeper
- name: Cleanup
if: always()
run: |
Expand Down
Loading

0 comments on commit 8e9be16

Please sign in to comment.