diff --git a/.env b/.env index 546eb84253..2e86217ede 100644 --- a/.env +++ b/.env @@ -1,8 +1,8 @@ REPO=milvusdb/milvus-distributed-dev ARCH=amd64 UBUNTU=18.04 -DATE_VERSION=20210317-075153 -LATEST_DATE_VERSION=20210317-075153 +DATE_VERSION=20210318-090357 +LATEST_DATE_VERSION=20210318-090357 MINIO_ADDRESS=minio:9000 PULSAR_ADDRESS=pulsar://pulsar:6650 ETCD_ADDRESS=etcd:2379 diff --git a/.jenkins/modules/Build/Build.groovy b/.jenkins/modules/Build/Build.groovy index ed31471883..490a432943 100644 --- a/.jenkins/modules/Build/Build.groovy +++ b/.jenkins/modules/Build/Build.groovy @@ -3,6 +3,7 @@ timeout(time: 20, unit: 'MINUTES') { sh '. ./scripts/before-install.sh && ./scripts/check_cache.sh -l $CCACHE_ARTFACTORY_URL --cache_dir=\$CCACHE_DIR -f ccache-\$OS_NAME-\$BUILD_ENV_IMAGE_ID.tar.gz || echo \"Ccache artfactory files not found!\"' sh '. ./scripts/before-install.sh && ./scripts/check_cache.sh -l $GO_CACHE_ARTFACTORY_URL --cache_dir=\$(go env GOCACHE) -f go-cache-\$OS_NAME-\$BUILD_ENV_IMAGE_ID.tar.gz || echo \"Go cache artfactory files not found!\"' sh '. ./scripts/before-install.sh && ./scripts/check_cache.sh -l $THIRDPARTY_ARTFACTORY_URL --cache_dir=$CUSTOM_THIRDPARTY_PATH -f thirdparty-download.tar.gz || echo \"Thirdparty artfactory files not found!\"' + sh '. ./scripts/before-install.sh && go clean --modcache && ./scripts/check_cache.sh -l $GO_MOD_ARTFACTORY_URL --cache_dir=\$GOPATH/pkg/mod -f milvus-distributed-go-mod-\$(md5sum go.mod).tar.gz || echo \"Go mod artfactory files not found!\"' // Zero the cache statistics (but not the configuration options) sh 'ccache -z' @@ -14,5 +15,6 @@ timeout(time: 20, unit: 'MINUTES') { sh '. ./scripts/before-install.sh && ./scripts/update_cache.sh -l $CCACHE_ARTFACTORY_URL --cache_dir=\$CCACHE_DIR -f ccache-\$OS_NAME-\$BUILD_ENV_IMAGE_ID.tar.gz -u ${USERNAME} -p ${PASSWORD}' sh '. ./scripts/before-install.sh && ./scripts/update_cache.sh -l $GO_CACHE_ARTFACTORY_URL --cache_dir=\$(go env GOCACHE) -f go-cache-\$OS_NAME-\$BUILD_ENV_IMAGE_ID.tar.gz -u ${USERNAME} -p ${PASSWORD}' sh '. ./scripts/before-install.sh && ./scripts/update_cache.sh -l $THIRDPARTY_ARTFACTORY_URL --cache_dir=$CUSTOM_THIRDPARTY_PATH -f thirdparty-download.tar.gz -u ${USERNAME} -p ${PASSWORD}' + sh '. ./scripts/before-install.sh && ./scripts/update_cache.sh -l $GO_MOD_ARTFACTORY_URL --cache_dir=\$GOPATH/pkg/mod -f milvus-distributed-go-mod-\$(md5sum go.mod).tar.gz -u ${USERNAME} -p ${PASSWORD}' } } diff --git a/build/ci/jenkins/pod/build-env.yaml b/build/ci/jenkins/pod/build-env.yaml index 5f5798fbd6..aa573d8030 100644 --- a/build/ci/jenkins/pod/build-env.yaml +++ b/build/ci/jenkins/pod/build-env.yaml @@ -8,12 +8,12 @@ metadata: spec: containers: - name: build-env - image: milvusdb/milvus-distributed-dev:amd64-ubuntu18.04-20210317-075153 + image: milvusdb/milvus-distributed-dev:amd64-ubuntu18.04-20210318-090357 env: - name: OS_NAME value: "ubuntu18.04" - name: BUILD_ENV_IMAGE_ID - value: "667cb91a031ac26ce136564889e35155357b0b7ac1435f63cc3611a8b3512536" + value: "9272a80d2726d7cf79820772ad2e9257c5f34bf091759e6d5a64ca4373c97f4d" securityContext: runAsUser: 1000 runAsGroup: 1000