From 46a63f43f36c495089cca3e9a78f7901bee6981e Mon Sep 17 00:00:00 2001
From: quicksilver <zhifeng.zhang@zilliz.com>
Date: Sun, 14 Jul 2019 09:33:35 +0800
Subject: [PATCH 1/2] MS-215 - add milvus cluster CI/CD groovy file

Former-commit-id: 6d3159ab782c4acb0bc31831438e09015ed447fa
---
 ci/jenkinsfile/cluster_deploy2dev.groovy |  8 +++++---
 ci/jenkinsfile/deploy2dev.groovy         |  8 +++++---
 ci/main_jenkinsfile                      | 22 ++++++++++++----------
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/ci/jenkinsfile/cluster_deploy2dev.groovy b/ci/jenkinsfile/cluster_deploy2dev.groovy
index 97062922ca..4347ea0938 100644
--- a/ci/jenkinsfile/cluster_deploy2dev.groovy
+++ b/ci/jenkinsfile/cluster_deploy2dev.groovy
@@ -7,9 +7,11 @@ try {
         dir ("milvus/milvus-cluster") {
             sh "helm install --set roServers.image.tag=${DOCKER_VERSION} --set woServers.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP -f ci/values.yaml --name ${env.JOB_NAME}-${env.BUILD_NUMBER}-cluster --namespace milvus-cluster --version 0.1.0 . "
         }
-        waitUntil {
-            def result = sh script: "nc -z -w 2 ${env.JOB_NAME}-${env.BUILD_NUMBER}-cluster-milvus-cluster-proxy.milvus-cluster.svc.cluster.local 19530", returnStatus: true
-            return !result
+        timeout(time: 2, unit: 'MINUTES') {
+            waitUntil {
+                def result = sh script: "nc -z -w 2 ${env.JOB_NAME}-${env.BUILD_NUMBER}-cluster-milvus-cluster-proxy.milvus-cluster.svc.cluster.local 19530", returnStatus: true
+                return !result
+            }
         }
     }
 } catch (exc) {
diff --git a/ci/jenkinsfile/deploy2dev.groovy b/ci/jenkinsfile/deploy2dev.groovy
index f594d0ba57..607149f35d 100644
--- a/ci/jenkinsfile/deploy2dev.groovy
+++ b/ci/jenkinsfile/deploy2dev.groovy
@@ -3,9 +3,11 @@ try {
     sh 'helm repo add milvus https://registry.zilliz.com/chartrepo/milvus'
     sh 'helm repo update'
     sh "helm install --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.JOB_NAME}-${env.BUILD_NUMBER} --version 0.3.0 milvus/milvus-gpu"
-    waitUntil {
-        def result = sh script: "nc -z -w 2 ${env.JOB_NAME}-${env.BUILD_NUMBER}-milvus-gpu-engine.kube-opt.svc.cluster.local 19530", returnStatus: true
-        return !result
+    timeout(time: 2, unit: 'MINUTES') {
+        waitUntil {
+            def result = sh script: "nc -z -w 2 ${env.JOB_NAME}-${env.BUILD_NUMBER}-milvus-gpu-engine.kube-opt.svc.cluster.local 19530", returnStatus: true
+            return !result
+        }
     }
 } catch (exc) {
     updateGitlabCommitStatus name: 'Deloy to Dev', state: 'failed'
diff --git a/ci/main_jenkinsfile b/ci/main_jenkinsfile
index 1f0d0c3d7f..a324ff4441 100644
--- a/ci/main_jenkinsfile
+++ b/ci/main_jenkinsfile
@@ -337,16 +337,18 @@ spec:
     post {
         always {
             script {
-                if (!currentBuild.resultIsBetterOrEqualTo('SUCCESS')) {
-                    // Send an email only if the build status has changed from green/unstable to red
-                    emailext subject: '$DEFAULT_SUBJECT',
-                    body: '$DEFAULT_CONTENT',
-                    recipientProviders: [
-                        [$class: 'DevelopersRecipientProvider'],
-                        [$class: 'RequesterRecipientProvider']
-                    ],
-                    replyTo: '$DEFAULT_REPLYTO',
-                    to: '$DEFAULT_RECIPIENTS'
+                if (env.gitlabAfter != null) {
+                    if (!currentBuild.resultIsBetterOrEqualTo('SUCCESS')) {
+                        // Send an email only if the build status has changed from green/unstable to red
+                        emailext subject: '$DEFAULT_SUBJECT',
+                        body: '$DEFAULT_CONTENT',
+                        recipientProviders: [
+                            [$class: 'DevelopersRecipientProvider'],
+                            [$class: 'RequesterRecipientProvider']
+                        ],
+                        replyTo: '$DEFAULT_REPLYTO',
+                        to: '$DEFAULT_RECIPIENTS'
+                    }
                 }
             }
         }

From f45037322c1a50f05f68daa58837647053bf8c5d Mon Sep 17 00:00:00 2001
From: quicksilver <zhifeng.zhang@zilliz.com>
Date: Sun, 14 Jul 2019 09:34:47 +0800
Subject: [PATCH 2/2] change cpp CHANGELOGS.md

Former-commit-id: f57d675bf412261f544708860ccdd486933ca79c
---
 CHANGELOGS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOGS.md b/CHANGELOGS.md
index def4965a41..3cc1b28d82 100644
--- a/CHANGELOGS.md
+++ b/CHANGELOGS.md
@@ -16,3 +16,4 @@ Please mark all change in change log and use the ticket from JIRA.
 
 - MS-1 - Add CHANGELOG.md
 - MS-161 - Add CI / CD Module to Milvus Project
+- MS-215 - Add Milvus cluster CI/CD groovy file