Skip to content

Commit 6a7e191

Browse files
ilejnEnmk
authored andcommitted
Fixes required for tests to work on Hetzner Cloud
other IPv6 addr, explicit 8.8.8.8 dns (cherry-picked a028c29)
1 parent 6dc7df3 commit 6a7e191

2 files changed

Lines changed: 27 additions & 2 deletions

File tree

.github/workflows/release_branches.yml

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,18 @@ jobs:
379379
runs-on: [self-hosted, style-checker, on-demand, type-cpx51, image-x86-app-docker-ce]
380380
timeout-minutes: 180
381381
steps:
382+
- name: Setup
383+
run: |
384+
sudo touch /etc/docker/daemon.json
385+
sudo chown ubuntu:ubuntu /etc/docker/daemon.json
386+
sudo cat <<EOT > /etc/docker/daemon.json
387+
{
388+
"ipv6": true,
389+
"fixed-cidr-v6": "2001:3984:3989::/64"
390+
}
391+
EOT
392+
sudo chown root:root /etc/docker/daemon.json
393+
sudo systemctl restart docker
382394
- name: Set envs
383395
run: |
384396
cat >> "$GITHUB_ENV" << 'EOF'
@@ -473,7 +485,7 @@ jobs:
473485
sudo cat <<EOT > /etc/docker/daemon.json
474486
{
475487
"ipv6": true,
476-
"fixed-cidr-v6": "2001:db8:1::/64"
488+
"fixed-cidr-v6": "2001:3984:3989::/64"
477489
}
478490
EOT
479491
sudo chown root:root /etc/docker/daemon.json
@@ -543,6 +555,18 @@ jobs:
543555
runs-on: [self-hosted, func-tester, on-demand, type-ccx53, image-x86-app-docker-ce]
544556
timeout-minutes: 180
545557
steps:
558+
- name: Setup
559+
run: |
560+
sudo touch /etc/docker/daemon.json
561+
sudo chown ubuntu:ubuntu /etc/docker/daemon.json
562+
sudo cat <<EOT > /etc/docker/daemon.json
563+
{
564+
"ipv6": true,
565+
"fixed-cidr-v6": "2001:3984:3989::/64"
566+
}
567+
EOT
568+
sudo chown root:root /etc/docker/daemon.json
569+
sudo systemctl restart docker
546570
- name: Set envs
547571
run: |
548572
cat >> "$GITHUB_ENV" << 'EOF'
@@ -559,7 +583,7 @@ jobs:
559583
sudo cat <<EOT > /etc/docker/daemon.json
560584
{
561585
"ipv6": true,
562-
"fixed-cidr-v6": "2001:db8:1::/64"
586+
"fixed-cidr-v6": "2001:3984:3989::/64"
563587
}
564588
EOT
565589
sudo chown root:root /etc/docker/daemon.json

tests/ci/functional_test_check.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ def get_run_command(
107107

108108
return (
109109
f"docker run --volume={builds_path}:/package_folder "
110+
f"--dns=8.8.8.8 "
110111
f"--volume={repo_tests_path}:/usr/share/clickhouse-test "
111112
f"--volume={result_path}:/test_output --volume={server_log_path}:/var/log/clickhouse-server "
112113
f"--cap-add=SYS_PTRACE {env_str} {additional_options_str} {image}"

0 commit comments

Comments
 (0)