From 79e43ddbcce40d4f6bbd94e98c855f5633d2258a Mon Sep 17 00:00:00 2001 From: quicksilver Date: Tue, 8 Jun 2021 00:32:37 +0800 Subject: [PATCH] Update pytest docker compose file (#5657) * Update pytest docker compose file Signed-off-by: quicksilver * Update pytest docker compose file Signed-off-by: quicksilver * Update pytest docker compose file Signed-off-by: quicksilver --- tests/docker/.env | 3 +-- tests/docker/docker-compose.yml | 4 ++-- tests/scripts/e2e.sh | 3 ++- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/docker/.env b/tests/docker/.env index c7a6ddc19..c98a7c9bf 100644 --- a/tests/docker/.env +++ b/tests/docker/.env @@ -1,5 +1,4 @@ SERVICE_IP=127.0.0.1 SERVICE_PORT=19530 IMAGE_REPO=milvusdb -IMAGE_TAG=20210331-546c8df -PRE_EXIST_NETWORK=bridge \ No newline at end of file +IMAGE_TAG=20210331-546c8df \ No newline at end of file diff --git a/tests/docker/docker-compose.yml b/tests/docker/docker-compose.yml index 0f2a0a88f..3f7c42768 100644 --- a/tests/docker/docker-compose.yml +++ b/tests/docker/docker-compose.yml @@ -18,5 +18,5 @@ services: networks: default: - external: - name: ${PRE_EXIST_NETWORK} + external: ${PRE_EXIST_NETWORK:-false} + name: ${PYTEST_NETWORK:-pytest} diff --git a/tests/scripts/e2e.sh b/tests/scripts/e2e.sh index e7ff7b929..3e4a93d41 100755 --- a/tests/scripts/e2e.sh +++ b/tests/scripts/e2e.sh @@ -54,7 +54,8 @@ fi pushd "${ROOT}/tests/docker" docker-compose pull --ignore-pull-failures pytest if [[ "${TEST_ENV:-}" =~ ^kind* ]]; then - export PRE_EXIST_NETWORK="kind" + export PRE_EXIST_NETWORK="true" + export PYTEST_NETWORK="kind" fi export SERVICE_IP="${SERVICE_IP:-127.0.0.1}" -- GitLab