Merge pull request #30129 from ClickHouse/backport/21.8/29762

Backport #29762 to 21.8: May be fix s3 tests
ClickHouse · Oct 14, 2021 · 63a3814 · 63a3814
2 parents acbf4fc + aec2447
commit 63a3814
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/docker/test/integration/runner/compose/docker_compose_minio.yml b/docker/test/integration/runner/compose/docker_compose_minio.yml
@@ -2,7 +2,9 @@ version: '2.3'
 
 services:
   minio1:
-    image: minio/minio
+    # Newer version of minio results in such errors:
+    # "AWSErrorMarshaller: Encountered AWSError 'InternalError': We encountered an internal error, please try again"
+    image: minio/minio:RELEASE.2021-09-23T04-46-24Z
     volumes:
       - data1-1:/data1
       - ${MINIO_CERTS_DIR:-}:/certs

diff --git a/tests/integration/test_merge_tree_s3/test.py b/tests/integration/test_merge_tree_s3/test.py
@@ -28,7 +28,6 @@ def join(self, timeout=None):
         if self.exception:
             raise self.exception
 
-
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 CONFIG_PATH = os.path.join(SCRIPT_DIR, './{}/node/configs/config.d/storage_conf.xml'.format(get_instances_dir()))