Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor the Docker file for integration testing #331

Merged

Conversation

lzydmxy
Copy link
Contributor

@lzydmxy lzydmxy commented Jun 27, 2024

Which issues of this PR fixes:

This PR try to fix #330

Change log:

  • Remove docker/test/base/Dockerfile, we didn't need image raftkeeper/raftkeeper-test-base anymore
  • Add docker/test/integration/helper/Dockerfile, we change image from yandex/clickhouse-integration-helper to raftkeeper/raftkeeper-integration-helper
  • update zookeeper from 3.6.2 to 3.7.1
  • Integrate images zookeeper, raftkeeper-integration-helper, raftkeeper-integration-tests into the image raftkeeper/raftkeeper-integration-tests-runner, so that we can use raftkeeper-integration-tests-runner even if you are in an internal network environment.

@@ -197,6 +197,8 @@ def __init__(
self._docker_client = docker.from_env(version=os.environ.get("DOCKER_API_VERSION"))

self._container = None

self.image = "raftkeeper/raftkeeper-integration-helper"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use a more intuitive name, such as network_partition_image

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, i rename it from raftkeeper-integration-helper to raftkeeper-network-partition

@@ -1,19 +1,26 @@
#!/bin/bash
set -e

dockerd --host=unix:///var/run/docker.sock --host=tcp://0.0.0.0:2375 &>/var/log/somefile &
setsid dockerd --host=unix:///var/run/docker.sock --tls=false --host=tcp://0.0.0.0:2375 --default-address-pool base=172.17.0.0/12,size=24 &>/var/log/somefile &
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why we need set network to 172.17.0.0/12,size=24?

@JackyWoo JackyWoo added the enhancement Enhancements label Jun 28, 2024
@JackyWoo JackyWoo added this to the Release v2.1.0 milestone Jun 28, 2024
@JackyWoo JackyWoo merged commit bca9c91 into JDRaftKeeper:master Jun 28, 2024
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Enhancements
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Refactor the Docker file for integration testing
2 participants