From b834cce8c3e0c0151f6aca80ac32686192eb98ad Mon Sep 17 00:00:00 2001
From: Jenny Li <jing.li@zilliz.com>
Date: Wed, 23 Nov 2022 19:09:11 +0800
Subject: [PATCH] Add jenkins e2e cache for conan (#20784)
Signed-off-by: Jenny Li <jing.li@zilliz.com>
Signed-off-by: Jenny Li <jing.li@zilliz.com>
---
build/builder.sh | 1 -
docker-compose.yml | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/build/builder.sh b/build/builder.sh
index 29d955b999..235dfc73f9 100755
--- a/build/builder.sh
+++ b/build/builder.sh
@@ -34,7 +34,6 @@ gid=$(id -g)
mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/amd64-${OS_NAME}-ccache"
mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/amd64-${OS_NAME}-go-mod"
-mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/thirdparty"
mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/amd64-${OS_NAME}-vscode-extensions"
mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/amd64-${OS_NAME}-conan"
chmod -R 777 "${DOCKER_VOLUME_DIRECTORY:-.docker}"
diff --git a/docker-compose.yml b/docker-compose.yml
index 28ab931d61..30a9be7d24 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,12 +27,11 @@ services:
PULSAR_ADDRESS: ${PULSAR_ADDRESS}
ETCD_ENDPOINTS: ${ETCD_ENDPOINTS}
MINIO_ADDRESS: ${MINIO_ADDRESS}
- CUSTOM_THIRDPARTY_PATH: /tmp/thirdparty
+ CONAN_USER_HOME: /home/milvus
volumes: &builder-volumes
- .:/go/src/github.com/milvus-io/milvus:delegated
- ${DOCKER_VOLUME_DIRECTORY:-.docker}/${IMAGE_ARCH}-${OS_NAME}-ccache:/ccache:delegated
- ${DOCKER_VOLUME_DIRECTORY:-.docker}/${IMAGE_ARCH}-${OS_NAME}-go-mod:/go/pkg/mod:delegated
- - ${DOCKER_VOLUME_DIRECTORY:-.docker}/thirdparty:/tmp/thirdparty:delegated
- ${DOCKER_VOLUME_DIRECTORY:-.docker}/${IMAGE_ARCH}-${OS_NAME}-vscode-extensions:/home/milvus/.vscode-server/extensions:delegated
- ${DOCKER_VOLUME_DIRECTORY:-.docker}/${IMAGE_ARCH}-${OS_NAME}-conan:/home/milvus/.conan:delegated
working_dir: '/go/src/github.com/milvus-io/milvus'