Merge pull request #464 from ZhifengZhang-CN/0.6.0

format Jenkinsfile

ci/jenkins/Jenkinsfile

@@ -53,7 +53,7 @@ pipeline {
                         stage("Run Build") {
                             agent {
                                 kubernetes {
-                                    label "${BINRARY_VERSION}-build"
+                                    label "${env.BINRARY_VERSION}-build"
                                     defaultContainer 'jnlp'
                                     yamlFile 'ci/jenkins/pod/milvus-gpu-version-build-env-pod.yaml'
                                 }
@@ -62,7 +62,7 @@ pipeline {
                             stages {
                                 stage('Build') {
                                     steps {
-                                        container('milvus-build-env') {
+                                        container("milvus-${env.BINRARY_VERSION}-build-env") {
                                             script {
                                                 load "${env.WORKSPACE}/ci/jenkins/step/build.groovy"
                                             }
@@ -71,7 +71,7 @@ pipeline {
                                 }
                                 stage('Code Coverage') {
                                     steps {
-                                        container('milvus-build-env') {
+                                        container("milvus-${env.BINRARY_VERSION}-build-env") {
                                             script {
                                                 load "${env.WORKSPACE}/ci/jenkins/step/coverage.groovy"
                                             }
@@ -80,7 +80,7 @@ pipeline {
                                 }
                                 stage('Upload Package') {
                                     steps {
-                                        container('milvus-build-env') {
+                                        container("milvus-${env.BINRARY_VERSION}-build-env") {
                                             script {
                                                 load "${env.WORKSPACE}/ci/jenkins/step/package.groovy"
                                             }
@@ -93,7 +93,7 @@ pipeline {
                         stage("Publish docker images") {
                             agent {
                                 kubernetes {
-                                    label "${BINRARY_VERSION}-publish"
+                                    label "${env.BINRARY_VERSION}-publish"
                                     defaultContainer 'jnlp'
                                     yamlFile 'ci/jenkins/pod/docker-pod.yaml'
                                 }
@@ -113,9 +113,13 @@ pipeline {
                         }
 
                         stage("Deploy to Development") {
+                            environment {
+                                HELM_RELEASE_NAME = "${env.PIPELINE_NAME}-${env.SEMVER}-${env.BUILD_NUMBER}-single-${env.BINRARY_VERSION}".toLowerCase()
+                            }
+
                             agent {
                                 kubernetes {
-                                    label "${BINRARY_VERSION}-dev-test"
+                                    label "${env.BINRARY_VERSION}-dev-test"
                                     defaultContainer 'jnlp'
                                     yamlFile 'ci/jenkins/pod/testEnvironment.yaml'
                                 }
@@ -183,7 +187,7 @@ pipeline {
                         stage("Run Build") {
                             agent {
                                 kubernetes {
-                                    label "${BINRARY_VERSION}-build"
+                                    label "${env.BINRARY_VERSION}-build"
                                     defaultContainer 'jnlp'
                                     yamlFile 'ci/jenkins/pod/milvus-cpu-version-build-env-pod.yaml'
                                 }
@@ -192,7 +196,7 @@ pipeline {
                             stages {
                                 stage('Build') {
                                     steps {
-                                        container('milvus-build-env') {
+                                        container("milvus-${env.BINRARY_VERSION}-build-env") {
                                             script {
                                                 load "${env.WORKSPACE}/ci/jenkins/step/build.groovy"
                                             }
@@ -201,7 +205,7 @@ pipeline {
                                 }
                                 stage('Code Coverage') {
                                     steps {
-                                        container('milvus-build-env') {
+                                        container("milvus-${env.BINRARY_VERSION}-build-env") {
                                             script {
                                                 load "${env.WORKSPACE}/ci/jenkins/step/coverage.groovy"
                                             }
@@ -210,7 +214,7 @@ pipeline {
                                 }
                                 stage('Upload Package') {
                                     steps {
-                                        container('milvus-build-env') {
+                                        container("milvus-${env.BINRARY_VERSION}-build-env") {
                                             script {
                                                 load "${env.WORKSPACE}/ci/jenkins/step/package.groovy"
                                             }
@@ -223,7 +227,7 @@ pipeline {
                         stage("Publish docker images") {
                             agent {
                                 kubernetes {
-                                    label "${BINRARY_VERSION}-publish"
+                                    label "${env.BINRARY_VERSION}-publish"
                                     defaultContainer 'jnlp'
                                     yamlFile 'ci/jenkins/pod/docker-pod.yaml'
                                 }
@@ -243,9 +247,13 @@ pipeline {
                         }
 
                         stage("Deploy to Development") {
+                            environment {
+                                HELM_RELEASE_NAME = "${env.PIPELINE_NAME}-${env.SEMVER}-${env.BUILD_NUMBER}-single-${env.BINRARY_VERSION}".toLowerCase()
+                            }
+
                             agent {
                                 kubernetes {
-                                    label "${BINRARY_VERSION}-dev-test"
+                                    label "${env.BINRARY_VERSION}-dev-test"
                                     defaultContainer 'jnlp'
                                     yamlFile 'ci/jenkins/pod/testEnvironment.yaml'
                                 }

ci/jenkins/pod/milvus-cpu-version-build-env-pod.yaml

@@ -7,7 +7,7 @@ metadata:
     componet: cpu-build-env
 spec:
   containers:
-  - name: milvus-build-env
+  - name: milvus-cpu-build-env
     image: registry.zilliz.com/milvus/milvus-cpu-build-env:v0.6.0-ubuntu18.04
     env:
     - name: POD_IP

ci/jenkins/pod/milvus-gpu-version-build-env-pod.yaml

@@ -7,7 +7,7 @@ metadata:
     componet: gpu-build-env
 spec:
   containers:
-  - name: milvus-build-env
+  - name: milvus-gpu-build-env
     image: registry.zilliz.com/milvus/milvus-gpu-build-env:v0.6.0-ubuntu18.04
     env:
     - name: POD_IP

ci/jenkins/step/cleanupSingleDev.groovy

 try {
-    def helmResult = sh script: "helm status ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-${env.BINRARY_VERSION}", returnStatus: true
+    def helmResult = sh script: "helm status ${env.HELM_RELEASE_NAME}", returnStatus: true
     if (!helmResult) {
-        sh "helm del --purge ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-${env.BINRARY_VERSION}"
+        sh "helm del --purge ${env.HELM_RELEASE_NAME}"
     }
 } catch (exc) {
-    def helmResult = sh script: "helm status ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-${env.BINRARY_VERSION}", returnStatus: true
+    def helmResult = sh script: "helm status ${env.HELM_RELEASE_NAME}", returnStatus: true
     if (!helmResult) {
-        sh "helm del --purge ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-${env.BINRARY_VERSION}"
+        sh "helm del --purge ${env.HELM_RELEASE_NAME}"
     }
     throw exc
 }

ci/jenkins/step/deploySingle2Dev.groovy

@@ -3,7 +3,7 @@ sh 'helm repo update'
 dir ('milvus-helm') {
     checkout([$class: 'GitSCM', branches: [[name: "0.6.0"]], userRemoteConfigs: [[url: "https://github.com/milvus-io/milvus-helm.git", name: 'origin', refspec: "+refs/heads/0.6.0:refs/remotes/origin/0.6.0"]]])
     dir ("milvus") {
-        sh "helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-${env.BINRARY_VERSION} -f ci/db_backend/sqlite_${env.BINRARY_VERSION}_values.yaml -f ci/filebeat/values.yaml --namespace milvus ."
+        sh "helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.HELM_RELEASE_NAME} -f ci/db_backend/sqlite_${env.BINRARY_VERSION}_values.yaml -f ci/filebeat/values.yaml --namespace milvus ."
     }
 }
 

ci/jenkins/step/publishImages.groovy

-container('publish-images') {
-    timeout(time: 15, unit: 'MINUTES') {
-        dir ("docker/deploy/${env.BINRARY_VERSION}/${env.OS_NAME}") {
-            def binaryPackage = "${PROJECT_NAME}-${PACKAGE_VERSION}.tar.gz"
+timeout(time: 15, unit: 'MINUTES') {
+    dir ("docker/deploy/${env.BINRARY_VERSION}/${env.OS_NAME}") {
+        def binaryPackage = "${PROJECT_NAME}-${PACKAGE_VERSION}.tar.gz"
 
-            withCredentials([usernamePassword(credentialsId: "${params.JFROG_CREDENTIALS_ID}", usernameVariable: 'JFROG_USERNAME', passwordVariable: 'JFROG_PASSWORD')]) {
-                def downloadStatus = sh(returnStatus: true, script: "curl -u${JFROG_USERNAME}:${JFROG_PASSWORD} -O ${params.JFROG_ARTFACTORY_URL}/milvus/package/${binaryPackage}")
+        withCredentials([usernamePassword(credentialsId: "${params.JFROG_CREDENTIALS_ID}", usernameVariable: 'JFROG_USERNAME', passwordVariable: 'JFROG_PASSWORD')]) {
+            def downloadStatus = sh(returnStatus: true, script: "curl -u${JFROG_USERNAME}:${JFROG_PASSWORD} -O ${params.JFROG_ARTFACTORY_URL}/milvus/package/${binaryPackage}")
 
-                if (downloadStatus != 0) {
-                    error("\" Download \" ${params.JFROG_ARTFACTORY_URL}/milvus/package/${binaryPackage} \" failed!")
-                }
+            if (downloadStatus != 0) {
+                error("\" Download \" ${params.JFROG_ARTFACTORY_URL}/milvus/package/${binaryPackage} \" failed!")
             }
-            sh "tar zxvf ${binaryPackage}"
-            def imageName = "${PROJECT_NAME}/engine:${DOCKER_VERSION}"
+        }
+        sh "tar zxvf ${binaryPackage}"
+        def imageName = "${PROJECT_NAME}/engine:${DOCKER_VERSION}"
 
-            try {
-                def isExistSourceImage = sh(returnStatus: true, script: "docker inspect --type=image ${imageName} 2>&1 > /dev/null")
-                if (isExistSourceImage == 0) {
-                    def removeSourceImageStatus = sh(returnStatus: true, script: "docker rmi ${imageName}")
-                }
+        try {
+            def isExistSourceImage = sh(returnStatus: true, script: "docker inspect --type=image ${imageName} 2>&1 > /dev/null")
+            if (isExistSourceImage == 0) {
+                def removeSourceImageStatus = sh(returnStatus: true, script: "docker rmi ${imageName}")
+            }
 
-                def customImage = docker.build("${imageName}")
+            def customImage = docker.build("${imageName}")
 
-                def isExistTargeImage = sh(returnStatus: true, script: "docker inspect --type=image ${params.DOKCER_REGISTRY_URL}/${imageName} 2>&1 > /dev/null")
-                if (isExistTargeImage == 0) {
-                    def removeTargeImageStatus = sh(returnStatus: true, script: "docker rmi ${params.DOKCER_REGISTRY_URL}/${imageName}")
-                }
+            def isExistTargeImage = sh(returnStatus: true, script: "docker inspect --type=image ${params.DOKCER_REGISTRY_URL}/${imageName} 2>&1 > /dev/null")
+            if (isExistTargeImage == 0) {
+                def removeTargeImageStatus = sh(returnStatus: true, script: "docker rmi ${params.DOKCER_REGISTRY_URL}/${imageName}")
+            }
 
-                docker.withRegistry("https://${params.DOKCER_REGISTRY_URL}", "${params.DOCKER_CREDENTIALS_ID}") {
-                    customImage.push()
-                }
-            } catch (exc) {
-                throw exc
-            } finally {
-                def isExistSourceImage = sh(returnStatus: true, script: "docker inspect --type=image ${imageName} 2>&1 > /dev/null")
-                if (isExistSourceImage == 0) {
-                    def removeSourceImageStatus = sh(returnStatus: true, script: "docker rmi ${imageName}")
-                }
+            docker.withRegistry("https://${params.DOKCER_REGISTRY_URL}", "${params.DOCKER_CREDENTIALS_ID}") {
+                customImage.push()
+            }
+        } catch (exc) {
+            throw exc
+        } finally {
+            def isExistSourceImage = sh(returnStatus: true, script: "docker inspect --type=image ${imageName} 2>&1 > /dev/null")
+            if (isExistSourceImage == 0) {
+                def removeSourceImageStatus = sh(returnStatus: true, script: "docker rmi ${imageName}")
+            }
 
-                def isExistTargeImage = sh(returnStatus: true, script: "docker inspect --type=image ${params.DOKCER_REGISTRY_URL}/${imageName} 2>&1 > /dev/null")
-                if (isExistTargeImage == 0) {
-                    def removeTargeImageStatus = sh(returnStatus: true, script: "docker rmi ${params.DOKCER_REGISTRY_URL}/${imageName}")
-                }
+            def isExistTargeImage = sh(returnStatus: true, script: "docker inspect --type=image ${params.DOKCER_REGISTRY_URL}/${imageName} 2>&1 > /dev/null")
+            if (isExistTargeImage == 0) {
+                def removeTargeImageStatus = sh(returnStatus: true, script: "docker rmi ${params.DOKCER_REGISTRY_URL}/${imageName}")
             }
-        } 
+        }
     }
 }

ci/jenkins/step/singleDevNightlyTest.groovy

 timeout(time: 90, unit: 'MINUTES') {
     dir ("tests/milvus_python_test") {
         sh 'python3 -m pip install -r requirements.txt'
-        sh "pytest . --alluredir=\"test_out/dev/single/sqlite\" --ip ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-${env.BINRARY_VERSION}-engine.milvus.svc.cluster.local"
+        sh "pytest . --alluredir=\"test_out/dev/single/sqlite\" --ip ${env.HELM_RELEASE_NAME}-engine.milvus.svc.cluster.local"
     }
     // mysql database backend test
     load "ci/jenkins/jenkinsfile/cleanupSingleDev.groovy"
@@ -13,10 +13,10 @@ timeout(time: 90, unit: 'MINUTES') {
     }
     dir ("milvus-helm") {
         dir ("milvus") {
-            sh "helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-${env.BINRARY_VERSION} -f ci/db_backend/mysql_${env.BINRARY_VERSION}_values.yaml -f ci/filebeat/values.yaml --namespace milvus ."
+            sh "helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.HELM_RELEASE_NAME} -f ci/db_backend/mysql_${env.BINRARY_VERSION}_values.yaml -f ci/filebeat/values.yaml --namespace milvus ."
         }
     }
     dir ("tests/milvus_python_test") {
-        sh "pytest . --alluredir=\"test_out/dev/single/mysql\" --ip ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-${env.BINRARY_VERSION}-engine.milvus.svc.cluster.local"
+        sh "pytest . --alluredir=\"test_out/dev/single/mysql\" --ip ${env.HELM_RELEASE_NAME}-engine.milvus.svc.cluster.local"
     }
 }

ci/jenkins/step/singleDevTest.groovy

 timeout(time: 60, unit: 'MINUTES') {
     dir ("tests/milvus_python_test") {
         sh 'python3 -m pip install -r requirements.txt'
-        sh "pytest . --alluredir=\"test_out/dev/single/sqlite\" --level=1 --ip ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-${env.BINRARY_VERSION}-engine.milvus.svc.cluster.local"
+        sh "pytest . --alluredir=\"test_out/dev/single/sqlite\" --level=1 --ip ${env.HELM_RELEASE_NAME}-engine.milvus.svc.cluster.local"
     }
 
     // mysql database backend test
@@ -14,10 +14,10 @@ timeout(time: 60, unit: 'MINUTES') {
     // }
     // dir ("milvus-helm") {
     //     dir ("milvus") {
-    //         sh "helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-${env.BINRARY_VERSION} -f ci/db_backend/mysql_${env.BINRARY_VERSION}_values.yaml -f ci/filebeat/values.yaml --namespace milvus ."
+    //         sh "helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.HELM_RELEASE_NAME} -f ci/db_backend/mysql_${env.BINRARY_VERSION}_values.yaml -f ci/filebeat/values.yaml --namespace milvus ."
     //     }
     // }
     // dir ("tests/milvus_python_test") {
-    //     sh "pytest . --alluredir=\"test_out/dev/single/mysql\" --level=1 --ip ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-${env.BINRARY_VERSION}-engine.milvus.svc.cluster.local"
+    //     sh "pytest . --alluredir=\"test_out/dev/single/mysql\" --level=1 --ip ${env.HELM_RELEASE_NAME}-engine.milvus.svc.cluster.local"
     // }
 }