arm_22.8.15: other IPv6 addr, explicit 8.8.8.8 dns

Altinity · Sep 14, 2023 · a028c29 · a028c29
1 parent fc964cc
commit a028c29
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 11 deletions.
diff --git a/.github/workflows/release_branches.yml b/.github/workflows/release_branches.yml
@@ -352,6 +352,18 @@ jobs:
     needs: [BuilderDebRelease]
     runs-on: [self-hosted, func-tester, on-demand, type-cpx51, image-x86-snapshot-docker_ipv6_x86]
     steps:
+      - name: Setup
+        run: |
+          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
       - name: Set envs
         run: |
           cat >> "$GITHUB_ENV" << 'EOF'
@@ -397,7 +409,7 @@ jobs:
           sudo cat <<EOT > /etc/docker/daemon.json
             {
                "ipv6": true,
-               "fixed-cidr-v6": "2001:db8:1::/64"
+               "fixed-cidr-v6": "2001:3984:3989::/64"
             }
           EOT
           sudo chown root:root /etc/docker/daemon.json
@@ -443,6 +455,18 @@ jobs:
     needs: [BuilderDebRelease]
     runs-on: [self-hosted, func-tester, on-demand, type-cpx51, image-x86-snapshot-docker_ipv6_x86]
     steps:
+      - name: Setup
+        run: |
+          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
       - name: Set envs
         run: |
           cat >> "$GITHUB_ENV" << 'EOF'
@@ -486,7 +510,7 @@ jobs:
           sudo cat <<EOT > /etc/docker/daemon.json
             {
                "ipv6": true,
-               "fixed-cidr-v6": "2001:db8:1::/64"
+               "fixed-cidr-v6": "2001:3984:3989::/64"
             }
           EOT
           sudo chown root:root /etc/docker/daemon.json
@@ -609,7 +633,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - run: true
-  
+
   RegressionCommonAmd64:
     strategy:
       fail-fast: false
@@ -731,7 +755,7 @@ jobs:
             ./*/_instances/*/logs/*.log
             ./*/*/_instances/*/logs/*.log
             ./*/*/_instances/*.log
-  
+
   RegressionBenchmark:
     strategy:
       fail-fast: false
@@ -806,7 +830,7 @@ jobs:
             ./*/_instances/*/logs/*.log
             ./*/*/_instances/*/logs/*.log
             ./*/*/_instances/*.log
-  
+
   RegressionLDAP:
     strategy:
       fail-fast: false
@@ -872,7 +896,7 @@ jobs:
             ./*/_instances/*/logs/*.log
             ./*/*/_instances/*/logs/*.log
             ./*/*/_instances/*.log
-  
+
   RegressionParquetAmd64:
     needs: [RegressionStart]
     runs-on: [self-hosted, stress-tester]
@@ -939,7 +963,7 @@ jobs:
             ./*/_instances/*/logs/*.log
             ./*/*/_instances/*/logs/*.log
             ./*/*/_instances/*.log
-  
+
   RegressionS3:
     strategy:
       fail-fast: false
@@ -1162,4 +1186,3 @@ jobs:
         run: |
           cd "$GITHUB_WORKSPACE/tests/ci"
           python3 finish_check.py
-
diff --git a/tests/ci/functional_test_check.py b/tests/ci/functional_test_check.py
@@ -101,6 +101,7 @@ def get_run_command(
 
     return (
         f"docker run --volume={builds_path}:/package_folder "
+        f"--dns=8.8.8.8 "
         f"--volume={repo_tests_path}:/usr/share/clickhouse-test "
         f"--volume={result_path}:/test_output --volume={server_log_path}:/var/log/clickhouse-server "
         f"--cap-add=SYS_PTRACE {env_str} {additional_options_str} {image}"

diff --git a/tests/queries/0_stateless/02286_drop_filesystem_cache.reference b/tests/queries/0_stateless/02286_drop_filesystem_cache.reference
@@ -7,7 +7,7 @@ CREATE TABLE test (key UInt32, value String)
 Engine=MergeTree()
 ORDER BY key
 SETTINGS storage_policy='s3_cache', min_bytes_for_wide_part = 10485760;
-SYSTEM STOP MERGES;
+SYSTEM STOP MERGES test;
 SYSTEM DROP FILESYSTEM CACHE;
 SELECT count() FROM system.filesystem_cache;
 0
@@ -76,7 +76,7 @@ CREATE TABLE test (key UInt32, value String)
 Engine=MergeTree()
 ORDER BY key
 SETTINGS storage_policy='local_cache', min_bytes_for_wide_part = 10485760;
-SYSTEM STOP MERGES;
+SYSTEM STOP MERGES test;
 SYSTEM DROP FILESYSTEM CACHE;
 SELECT count() FROM system.filesystem_cache;
 0
@@ -135,4 +135,3 @@ SELECT count() FROM system.filesystem_cache;
 SYSTEM DROP FILESYSTEM CACHE 'local_cache_2/';
 SELECT count() FROM system.filesystem_cache;
 0
-