thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 15:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename more images

Browse Source
This commit is contained in:
alesapin 2021-09-08 13:03:54 +03:00
parent ca8d478575
commit 3f11cbd31b
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/integration/README.md
View File

@ -66,7 +66,7 @@ For tests that use common docker compose files you may need to set up their path
### Running with runner script ### Running with runner script
The only requirement is fresh configured docker and The only requirement is fresh configured docker and
docker pull yandex/clickhouse-integration-tests-runner docker pull clickhouse/integration-tests-runner
Notes: Notes:
* If you want to run integration tests without `sudo` you have to add your user to docker group `sudo usermod -aG docker $USER`. [More information](https://docs.docker.com/install/linux/linux-postinstall/) about docker configuration. * If you want to run integration tests without `sudo` you have to add your user to docker group `sudo usermod -aG docker $USER`. [More information](https://docs.docker.com/install/linux/linux-postinstall/) about docker configuration.
@ -122,7 +122,7 @@ You can just open shell inside a container by overwritting the command:
The main container used for integration tests lives in `docker/test/integration/Dockerfile`. Rebuild it with The main container used for integration tests lives in `docker/test/integration/Dockerfile`. Rebuild it with
``` ```
cd docker/test/integration cd docker/test/integration
docker build -t yandex/clickhouse-integration-test . docker build -t clickhouse/integration-test .
``` ```
The helper container used by the `runner` script is in `docker/test/integration/runner/Dockerfile`. The helper container used by the `runner` script is in `docker/test/integration/runner/Dockerfile`.

12
tests/integration/ci-runner.py
View File

@ -207,11 +207,11 @@ class ClickhouseIntegrationTestsRunner:
@staticmethod @staticmethod
def get_images_names(): def get_images_names():
return ["yandex/clickhouse-integration-tests-runner", "yandex/clickhouse-mysql-golang-client", return ["clickhouse/integration-tests-runner", "clickhouse/mysql-golang-client",
"yandex/clickhouse-mysql-java-client", "yandex/clickhouse-mysql-js-client", "clickhouse/mysql-java-client", "clickhouse/mysql-js-client",
"yandex/clickhouse-mysql-php-client", "yandex/clickhouse-postgresql-java-client", "clickhouse/mysql-php-client", "clickhouse/postgresql-java-client",
"yandex/clickhouse-integration-test", "yandex/clickhouse-kerberos-kdc", "clickhouse/integration-test", "clickhouse/kerberos-kdc",
"yandex/clickhouse-integration-helper", ] "clickhouse/integration-helper", ]
def _can_run_with(self, path, opt): def _can_run_with(self, path, opt):
@ -343,7 +343,7 @@ class ClickhouseIntegrationTestsRunner:
image_cmd = '' image_cmd = ''
if self._can_run_with(os.path.join(repo_path, "tests/integration", "runner"), '--docker-image-version'): if self._can_run_with(os.path.join(repo_path, "tests/integration", "runner"), '--docker-image-version'):
for img in self.get_images_names(): for img in self.get_images_names():
if img == "yandex/clickhouse-integration-tests-runner": if img == "clickhouse/integration-tests-runner":
runner_version = self.get_single_image_version() runner_version = self.get_single_image_version()
logging.info("Can run with custom docker image version %s", runner_version) logging.info("Can run with custom docker image version %s", runner_version)
image_cmd += ' --docker-image-version={} '.format(runner_version) image_cmd += ' --docker-image-version={} '.format(runner_version)

6
tests/integration/helpers/cluster.py
View File

@ -532,7 +532,7 @@ class ClickHouseCluster:
binary_path = binary_path[:-len('-server')] binary_path = binary_path[:-len('-server')]
env_variables['keeper_binary'] = binary_path env_variables['keeper_binary'] = binary_path
env_variables['image'] = "yandex/clickhouse-integration-test:" + self.docker_base_tag env_variables['image'] = "clickhouse/integration-test:" + self.docker_base_tag
env_variables['user'] = str(os.getuid()) env_variables['user'] = str(os.getuid())
env_variables['keeper_fs'] = 'bind' env_variables['keeper_fs'] = 'bind'
for i in range(1, 4): for i in range(1, 4):
@ -757,7 +757,7 @@ class ClickHouseCluster:
with_odbc_drivers=False, with_postgres=False, with_postgres_cluster=False, with_hdfs=False, with_odbc_drivers=False, with_postgres=False, with_postgres_cluster=False, with_hdfs=False,
with_kerberized_hdfs=False, with_mongo=False, with_mongo_secure=False, with_nginx=False, with_kerberized_hdfs=False, with_mongo=False, with_mongo_secure=False, with_nginx=False,
with_redis=False, with_minio=False, with_cassandra=False, with_jdbc_bridge=False, with_redis=False, with_minio=False, with_cassandra=False, with_jdbc_bridge=False,
hostname=None, env_variables=None, image="yandex/clickhouse-integration-test", tag=None, hostname=None, env_variables=None, image="clickhouse/integration-test", tag=None,
stay_alive=False, ipv4_address=None, ipv6_address=None, with_installed_binary=False, tmpfs=None, stay_alive=False, ipv4_address=None, ipv6_address=None, with_installed_binary=False, tmpfs=None,
zookeeper_docker_compose_path=None, minio_certs_dir=None, use_keeper=True, zookeeper_docker_compose_path=None, minio_certs_dir=None, use_keeper=True,
main_config_name="config.xml", users_config_name="users.xml", copy_common_configs=True): main_config_name="config.xml", users_config_name="users.xml", copy_common_configs=True):
@ -1801,7 +1801,7 @@ class ClickHouseInstance:
clickhouse_start_command=CLICKHOUSE_START_COMMAND, clickhouse_start_command=CLICKHOUSE_START_COMMAND,
main_config_name="config.xml", users_config_name="users.xml", copy_common_configs=True, main_config_name="config.xml", users_config_name="users.xml", copy_common_configs=True,
hostname=None, env_variables=None, hostname=None, env_variables=None,
image="yandex/clickhouse-integration-test", tag="latest", image="clickhouse/integration-test", tag="latest",
stay_alive=False, ipv4_address=None, ipv6_address=None, with_installed_binary=False, tmpfs=None): stay_alive=False, ipv4_address=None, ipv6_address=None, with_installed_binary=False, tmpfs=None):
self.name = name self.name = name

8
tests/integration/helpers/network.py
View File

@ -195,21 +195,21 @@ class _NetworkManager:
print("Error removing network blocade container, will try again", str(ex)) print("Error removing network blocade container, will try again", str(ex))
time.sleep(i) time.sleep(i)
image = subprocess.check_output("docker images -q yandex/clickhouse-integration-helper 2>/dev/null", shell=True) image = subprocess.check_output("docker images -q clickhouse/integration-helper 2>/dev/null", shell=True)
if not image.strip(): if not image.strip():
print("No network image helper, will try download") print("No network image helper, will try download")
# for some reason docker api may hang if image doesn't exist, so we download it # for some reason docker api may hang if image doesn't exist, so we download it
# before running # before running
for i in range(5): for i in range(5):
try: try:
subprocess.check_call("docker pull yandex/clickhouse-integration-helper", shell=True) # STYLE_CHECK_ALLOW_SUBPROCESS_CHECK_CALL subprocess.check_call("docker pull clickhouse/integration-helper", shell=True) # STYLE_CHECK_ALLOW_SUBPROCESS_CHECK_CALL
break break
except: except:
time.sleep(i) time.sleep(i)
else: else:
raise Exception("Cannot pull yandex/clickhouse-integration-helper image") raise Exception("Cannot pull clickhouse/integration-helper image")
self._container = self._docker_client.containers.run('yandex/clickhouse-integration-helper', self._container = self._docker_client.containers.run('clickhouse/integration-helper',
auto_remove=True, auto_remove=True,
command=('sleep %s' % self.container_exit_timeout), command=('sleep %s' % self.container_exit_timeout),
detach=True, network_mode='host') detach=True, network_mode='host')

16
tests/integration/runner
View File

@ -19,7 +19,7 @@ CONFIG_DIR_IN_REPO = "programs/server"
INTERGATION_DIR_IN_REPO = "tests/integration" INTERGATION_DIR_IN_REPO = "tests/integration"
SRC_DIR_IN_REPO = "src" SRC_DIR_IN_REPO = "src"
DIND_INTEGRATION_TESTS_IMAGE_NAME = "yandex/clickhouse-integration-tests-runner" DIND_INTEGRATION_TESTS_IMAGE_NAME = "clickhouse/integration-tests-runner"
def check_args_and_update_paths(args): def check_args_and_update_paths(args):
if args.clickhouse_root: if args.clickhouse_root:
@ -225,19 +225,19 @@ if __name__ == "__main__":
if args.docker_compose_images_tags is not None: if args.docker_compose_images_tags is not None:
for img_tag in args.docker_compose_images_tags: for img_tag in args.docker_compose_images_tags:
[image, tag] = img_tag.split(":") [image, tag] = img_tag.split(":")
if image == "yandex/clickhouse-mysql-golang-client": if image == "clickhouse/mysql-golang-client":
env_tags += "-e {}={} ".format("DOCKER_MYSQL_GOLANG_CLIENT_TAG", tag) env_tags += "-e {}={} ".format("DOCKER_MYSQL_GOLANG_CLIENT_TAG", tag)
elif image == "yandex/clickhouse-mysql-java-client": elif image == "clickhouse/mysql-java-client":
env_tags += "-e {}={} ".format("DOCKER_MYSQL_JAVA_CLIENT_TAG", tag) env_tags += "-e {}={} ".format("DOCKER_MYSQL_JAVA_CLIENT_TAG", tag)
elif image == "yandex/clickhouse-mysql-js-client": elif image == "clickhouse/mysql-js-client":
env_tags += "-e {}={} ".format("DOCKER_MYSQL_JS_CLIENT_TAG", tag) env_tags += "-e {}={} ".format("DOCKER_MYSQL_JS_CLIENT_TAG", tag)
elif image == "yandex/clickhouse-mysql-php-client": elif image == "clickhouse/mysql-php-client":
env_tags += "-e {}={} ".format("DOCKER_MYSQL_PHP_CLIENT_TAG", tag) env_tags += "-e {}={} ".format("DOCKER_MYSQL_PHP_CLIENT_TAG", tag)
elif image == "yandex/clickhouse-postgresql-java-client": elif image == "clickhouse/postgresql-java-client":
env_tags += "-e {}={} ".format("DOCKER_POSTGRESQL_JAVA_CLIENT_TAG", tag) env_tags += "-e {}={} ".format("DOCKER_POSTGRESQL_JAVA_CLIENT_TAG", tag)
elif image == "yandex/clickhouse-integration-test": elif image == "clickhouse/integration-test":
env_tags += "-e {}={} ".format("DOCKER_BASE_TAG", tag) env_tags += "-e {}={} ".format("DOCKER_BASE_TAG", tag)
elif image == "yandex/clickhouse-kerberos-kdc": elif image == "clickhouse/kerberos-kdc":
env_tags += "-e {}={}".format("DOCKER_KERBEROS_KDC_TAG", tag) env_tags += "-e {}={}".format("DOCKER_KERBEROS_KDC_TAG", tag)
else: else:
logging.info("Unknown image %s" % (image)) logging.info("Unknown image %s" % (image))