Update milvus project name (milvus-io#5032)

* Update milvus project name
rizalgowandy · Apr 26, 2021 · 3b529f3 · 3b529f3
1 parent d4e7b4d
commit 3b529f3
Show file tree

Hide file tree

Showing 20 changed files with 77 additions and 299 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 '<none>' | 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 '<none>' | 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
@@ -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
@@ -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
@@ -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
@@ -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" <<EOF
-        {
-          "registry-mirrors": [
-            "https://hub-mirror.c.163.com",
-            "https://mirror.baidubce.com" ]
-        }
-        EOF
-    volumeMounts:
-    - name: docker-daemon
-      mountPath: /etc/docker
   volumes:
     - name: docker-graph-storage
       emptyDir: {}
-    - name: docker-daemon
-      emptyDir: {}
   tolerations:
   - key: dedicated
     operator: Equal

diff --git a/build/docker/deploy/.env b/build/docker/deploy/.env
diff --git a/build/docker/deploy/docker-compose.yml b/build/docker/deploy/docker-compose.yml