diff --git a/.env b/.env index 2e86217ede..25841ccdfd 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -REPO=milvusdb/milvus-distributed-dev +REPO=milvusdb/milvus-dev ARCH=amd64 UBUNTU=18.04 DATE_VERSION=20210318-090357 diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 342110b301..469f32f3a3 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -32,7 +32,7 @@ jobs: ubuntu: name: AMD64 Ubuntu ${{ matrix.ubuntu }} runs-on: ubuntu-latest - timeout-minutes: 60 + timeout-minutes: 90 strategy: fail-fast: false matrix: diff --git a/.github/workflows/publish-builder.yaml b/.github/workflows/publish-builder.yaml index 7b4a0fdd24..b4e562d9f0 100644 --- a/.github/workflows/publish-builder.yaml +++ b/.github/workflows/publish-builder.yaml @@ -47,7 +47,7 @@ jobs: DATE_VERSION=${{ steps.extracter.outputs.version }} docker-compose build ubuntu DATE_VERSION=latest docker-compose build ubuntu - name: Docker Push - if: success() && github.event_name == 'push' && github.repository == 'zilliztech/milvus-distributed' + if: success() && github.event_name == 'push' && github.repository == 'milvus-io/milvus' continue-on-error: true shell: bash run: | diff --git a/.github/workflows/publish-test-images.yaml b/.github/workflows/publish-test-images.yaml index 7e9dee765a..8d74adb173 100644 --- a/.github/workflows/publish-test-images.yaml +++ b/.github/workflows/publish-test-images.yaml @@ -42,7 +42,7 @@ jobs: docker build -t milvusdb/pytest:${{ steps.extracter.outputs.version }}-${{ steps.extracter.outputs.sha_short }} . docker tag milvusdb/pytest:${{ steps.extracter.outputs.version }}-${{ steps.extracter.outputs.sha_short }} milvusdb/pytest:latest - name: Docker Push - if: success() && github.event_name == 'push' && github.repository == 'zilliztech/milvus-distributed' + if: success() && github.event_name == 'push' && github.repository == 'milvus-io/milvus' continue-on-error: true shell: bash run: | diff --git a/.jenkins/modules/Build/Build.groovy b/.jenkins/modules/Build/Build.groovy index 490a432943..f106ec864c 100644 --- a/.jenkins/modules/Build/Build.groovy +++ b/.jenkins/modules/Build/Build.groovy @@ -3,7 +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!\"' + sh '. ./scripts/before-install.sh && go clean --modcache && ./scripts/check_cache.sh -l $GO_MOD_ARTFACTORY_URL --cache_dir=\$GOPATH/pkg/mod -f milvus-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' @@ -15,6 +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}' + sh '. ./scripts/before-install.sh && ./scripts/update_cache.sh -l $GO_MOD_ARTFACTORY_URL --cache_dir=\$GOPATH/pkg/mod -f milvus-go-mod-\$(md5sum go.mod).tar.gz -u ${USERNAME} -p ${PASSWORD}' } } diff --git a/.jenkins/modules/Publish/Publish.groovy b/.jenkins/modules/Publish/Publish.groovy index 9d736dcd2d..cba5be12d4 100644 --- a/.jenkins/modules/Publish/Publish.groovy +++ b/.jenkins/modules/Publish/Publish.groovy @@ -8,21 +8,18 @@ withCredentials([usernamePassword(credentialsId: "${env.JFROG_CREDENTIALS_ID}", sh 'tar zxvf ${PACKAGE_NAME}' -dir ('build/docker/deploy') { - try { - withCredentials([usernamePassword(credentialsId: "${env.DOCKER_CREDENTIALS_ID}", usernameVariable: 'DOCKER_USERNAME', passwordVariable: 'DOCKER_PASSWORD')]) { - sh 'docker login -u ${DOCKER_USERNAME} -p ${DOCKER_PASSWORD} ${DOKCER_REGISTRY_URL}' +try { + withCredentials([usernamePassword(credentialsId: "${env.DOCKER_CREDENTIALS_ID}", usernameVariable: 'DOCKER_USERNAME', passwordVariable: 'DOCKER_PASSWORD')]) { + sh 'docker login -u ${DOCKER_USERNAME} -p ${DOCKER_PASSWORD} ${DOKCER_REGISTRY_URL}' - sh 'docker pull registry.zilliz.com/milvus-distributed/milvus-distributed-dev:latest || true' - sh 'docker pull ${SOURCE_REPO}/milvus-distributed:${SOURCE_TAG} || true' - sh 'docker-compose build --force-rm master' - sh 'docker-compose push master' - } - } catch (exc) { - throw exc - } finally { - sh 'docker logout ${DOKCER_REGISTRY_URL}' - sh "docker rmi -f \$(docker images | grep '' | awk '{print \$3}') || true" - sh 'docker-compose down --rmi all' + sh 'docker pull registry.zilliz.com/milvus/openblas:latest || true' + sh "docker build -f build/docker/milvus/Dockerfile -t ${TARGET_REPO}/milvus:${TARGET_TAG} ." + sh "docker push ${TARGET_REPO}/milvus:${TARGET_TAG}" } +} catch (exc) { + throw exc +} finally { + sh 'docker logout ${DOKCER_REGISTRY_URL}' + sh "docker rmi -f \$(docker images | grep '' | awk '{print \$3}') || true" + sh "docker rmi ${TARGET_REPO}/milvus:${TARGET_TAG}" } diff --git a/.jenkins/modules/Regression/PythonRegression.groovy b/.jenkins/modules/Regression/PythonRegression.groovy index 9dd22bd74a..1c400d9c78 100644 --- a/.jenkins/modules/Regression/PythonRegression.groovy +++ b/.jenkins/modules/Regression/PythonRegression.groovy @@ -19,20 +19,20 @@ timeout(time: "${regressionTimeout}", unit: 'MINUTES') { if ("${REGRESSION_SERVICE_TYPE}" == "distributed") { helmCMD = "helm install --wait --timeout 300s \ --set standalone.enabled=false \ - --set image.all.repository=${env.TARGET_REPO}/milvus-distributed \ + --set image.all.repository=${env.TARGET_REPO}/milvus \ --set image.all.tag=${env.TARGET_TAG} \ --set image.all.pullPolicy=Always \ --set logsPersistence.enabled=true \ - --set logsPersistence.mountPath=/milvus-distributed/logs \ + --set logsPersistence.mountPath=/milvus/logs \ --namespace ${env.HELM_RELEASE_NAMESPACE} ${env.HELM_RELEASE_NAME} ." } else { helmCMD = "helm install --wait --timeout 300s \ --set standalone.enabled=true \ - --set image.all.repository=${env.TARGET_REPO}/milvus-distributed \ + --set image.all.repository=${env.TARGET_REPO}/milvus \ --set image.all.tag=${env.TARGET_TAG} \ --set image.all.pullPolicy=Always \ --set logsPersistence.enabled=true \ - --set logsPersistence.mountPath=/milvus-distributed/logs \ + --set logsPersistence.mountPath=/milvus/logs \ --namespace ${env.HELM_RELEASE_NAMESPACE} ${env.HELM_RELEASE_NAME} ." } diff --git a/build/ci/jenkins/Jenkinsfile b/build/ci/jenkins/Jenkinsfile index e520b8e0a6..df4152f4c2 100644 --- a/build/ci/jenkins/Jenkinsfile +++ b/build/ci/jenkins/Jenkinsfile @@ -26,8 +26,8 @@ pipeline { PACKAGE_ARTFACTORY_URL = "${JFROG_ARTFACTORY_URL}/${PROJECT_NAME}/package/${PACKAGE_NAME}" DOCKER_CREDENTIALS_ID = "ba070c98-c8cc-4f7c-b657-897715f359fc" DOKCER_REGISTRY_URL = "registry.zilliz.com" - SOURCE_REPO = "${DOKCER_REGISTRY_URL}/milvus-distributed" - TARGET_REPO = "${DOKCER_REGISTRY_URL}/milvus-distributed" + SOURCE_REPO = "${DOKCER_REGISTRY_URL}/milvus" + TARGET_REPO = "${DOKCER_REGISTRY_URL}/milvus" SOURCE_TAG = "${CHANGE_TARGET ? CHANGE_TARGET : SEMVER}-${LOWER_BUILD_TYPE}" TARGET_TAG = "${SEMVER}-${LOWER_BUILD_TYPE}" DOCKER_BUILDKIT = 1 @@ -45,11 +45,11 @@ pipeline { environment { PULSAR_ADDRESS = "pulsar://127.0.0.1:6650" ETCD_ADDRESS = "127.0.0.1:2379" - CCACHE_ARTFACTORY_URL = "${JFROG_ARTFACTORY_URL}/milvus-distributed/ccache" - THIRDPARTY_ARTFACTORY_URL = "${JFROG_ARTFACTORY_URL}/milvus-distributed/thirdparty" + CCACHE_ARTFACTORY_URL = "${JFROG_ARTFACTORY_URL}/milvus/ccache" + THIRDPARTY_ARTFACTORY_URL = "${JFROG_ARTFACTORY_URL}/milvus/thirdparty" CUSTOM_THIRDPARTY_PATH = "${WORKSPACE}/3rdparty_download" - GO_CACHE_ARTFACTORY_URL = "${JFROG_ARTFACTORY_URL}/milvus-distributed/go-cache" - GO_MOD_ARTFACTORY_URL = "${JFROG_ARTFACTORY_URL}/milvus-distributed/go-mod" + GO_CACHE_ARTFACTORY_URL = "${JFROG_ARTFACTORY_URL}/milvus/go-cache" + GO_MOD_ARTFACTORY_URL = "${JFROG_ARTFACTORY_URL}/milvus/go-mod" } steps { container('build-env') { @@ -84,7 +84,7 @@ pipeline { } } environment { - HELM_BRANCH = "2.0" + HELM_BRANCH = "main" HELM_RELEASE_NAMESPACE = "dev" HELM_RELEASE_NAME = "${PROJECT_NAME}-${SEMVER}-${env.BUILD_NUMBER}-${REGRESSION_SERVICE_TYPE}".replaceAll("\\.", "-").replaceAll("_", "-").toLowerCase() DEV_TEST_ARTIFACTS_PATH = "artifacts" diff --git a/build/ci/jenkins/pod/build-env.yaml b/build/ci/jenkins/pod/build-env.yaml index aa573d8030..ff5a010e00 100644 --- a/build/ci/jenkins/pod/build-env.yaml +++ b/build/ci/jenkins/pod/build-env.yaml @@ -3,7 +3,7 @@ kind: Pod metadata: name: build-env labels: - app: milvus-distributed + app: milvus componet: build-env spec: containers: diff --git a/build/ci/jenkins/pod/docker-pod.yaml b/build/ci/jenkins/pod/docker-pod.yaml index 0a82dd9cf2..bd74e55e9f 100644 --- a/build/ci/jenkins/pod/docker-pod.yaml +++ b/build/ci/jenkins/pod/docker-pod.yaml @@ -21,29 +21,9 @@ spec: volumeMounts: - name: docker-graph-storage mountPath: /var/lib/docker - - name: docker-daemon - mountPath: /etc/docker - initContainers: - - name: docker-daemon-config - image: registry.zilliz.com/library/dind-compose:v0.1 - command: ["sh", "-c"] - args: - - | - cat > "/etc/docker/daemon.json" < Getting help > You can get help for CLI tool using the `--help` flag, or `-h` for short. > ```shell -> $ milvus-distributed run master --help +> $ milvus run master --help > ``` ### Environment -The table below lists the environment variables that you can use to configure the `milvus-distributed` tool. +The table below lists the environment variables that you can use to configure the `milvus` tool. | Variable | Description | Default | | :-----:| :----: | :----: | -| MILVUS_CONF_PATH | Milvus configuration path | `/milvus-distributed/configs` | +| MILVUS_CONF_PATH | Milvus configuration path | `/milvus/configs` | diff --git a/docs/jaeger_guides/Opentracing User Guide.md b/docs/jaeger_guides/Opentracing User Guide.md index d5bfffbc82..07c7a18c14 100644 --- a/docs/jaeger_guides/Opentracing User Guide.md +++ b/docs/jaeger_guides/Opentracing User Guide.md @@ -20,7 +20,7 @@ See also: We mainly use jaeger as a implementation of opentracing. -Two request: **Insert Request** and **Search Request** in milvus-distributed system is traced at this stage. +Two request: **Insert Request** and **Search Request** in milvus system is traced at this stage. diff --git a/scripts/run_docker.sh b/scripts/run_docker.sh index be6b0bff43..271fe847d8 100755 --- a/scripts/run_docker.sh +++ b/scripts/run_docker.sh @@ -1,31 +1,31 @@ cd ../build/docker/deploy/ echo "starting master docker" -nohup docker-compose -p milvus-distributed up master > ~/master_docker.log 2>&1 & +nohup docker-compose -p milvus up master > ~/master_docker.log 2>&1 & echo "starting proxyservice docker" -nohup docker-compose -p milvus-distributed up proxyservice > ~/proxyservice_docker.log 2>&1 & +nohup docker-compose -p milvus up proxyservice > ~/proxyservice_docker.log 2>&1 & echo "starting proxynode docker" -nohup docker-compose -p milvus-distributed up proxynode > ~/proxynode_docker.log 2>&1 & +nohup docker-compose -p milvus up proxynode > ~/proxynode_docker.log 2>&1 & echo "starting indexservice docker" -nohup docker-compose -p milvus-distributed up indexservice > ~/indexservice_docker.log 2>&1 & +nohup docker-compose -p milvus up indexservice > ~/indexservice_docker.log 2>&1 & echo "starting indexnode docker" -nohup docker-compose -p milvus-distributed up indexnode > ~/indexnode_docker.log 2>&1 & +nohup docker-compose -p milvus up indexnode > ~/indexnode_docker.log 2>&1 & echo "starting queryservice docker" -nohup docker-compose -p milvus-distributed up queryservice > ~/queryservice_docker.log 2>&1 & +nohup docker-compose -p milvus up queryservice > ~/queryservice_docker.log 2>&1 & echo "starting dataservice docker" -nohup docker-compose -p milvus-distributed up dataservice > ~/dataservice_docker.log 2>&1 & +nohup docker-compose -p milvus up dataservice > ~/dataservice_docker.log 2>&1 & echo "starting querynode1 docker" -nohup docker-compose -p milvus-distributed run -e QUERY_NODE_ID=1 querynode > ~/querynode1_docker.log 2>&1 & +nohup docker-compose -p milvus run -e QUERY_NODE_ID=1 querynode > ~/querynode1_docker.log 2>&1 & echo "starting querynode2 docker" -nohup docker-compose -p milvus-distributed run -e QUERY_NODE_ID=2 querynode > ~/querynode2_docker.log 2>&1 & +nohup docker-compose -p milvus run -e QUERY_NODE_ID=2 querynode > ~/querynode2_docker.log 2>&1 & echo "starting datanode docker" -nohup docker-compose -p milvus-distributed run -e DATA_NODE_ID=3 datanode > ~/datanode_docker.log 2>&1 & +nohup docker-compose -p milvus run -e DATA_NODE_ID=3 datanode > ~/datanode_docker.log 2>&1 & diff --git a/tests/python_test/docker-compose.yml b/tests/python_test/docker-compose.yml index ee8f0bfea0..8609d56add 100644 --- a/tests/python_test/docker-compose.yml +++ b/tests/python_test/docker-compose.yml @@ -4,8 +4,8 @@ services: regression: image: milvusdb/pytest:latest volumes: - - ../..:/milvus-distributed:delegated - working_dir: "/milvus-distributed/tests/python_test" + - ../..:/milvus:delegated + working_dir: "/milvus/tests/python_test" networks: - milvus