From 1ab333ba1aa8a046c6867a51e4bc019660445712 Mon Sep 17 00:00:00 2001
From: zilliz <zilliz@zillizs-MacBook-Pro.local>
Date: Thu, 19 Dec 2019 18:52:08 +0800
Subject: [PATCH] Use Helm version 3 on Jenkins CI

---
 ci/jenkins/Jenkinsfile                  | 6 +++---
 ci/jenkins/step/deploySingle2Dev.groovy | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ci/jenkins/Jenkinsfile b/ci/jenkins/Jenkinsfile
index aed986e012..9c647146a6 100644
--- a/ci/jenkins/Jenkinsfile
+++ b/ci/jenkins/Jenkinsfile
@@ -66,7 +66,7 @@ pipeline {
                             stage('Run Build') {
                                 agent {
                                     kubernetes {
-                                        label "${OS_NAME}-${BINARY_VERSION}-build-${env.BUILD_NUMBER}"
+                                        label "${OS_NAME}-${BINARY_VERSION}-build-${env.PIPELINE_NAME}-${env.BUILD_NUMBER}"
                                         defaultContainer 'jnlp'
                                         yamlFile "ci/jenkins/pod/milvus-${BINARY_VERSION}-version-${OS_NAME}-build-env-pod.yaml"
                                     }
@@ -112,7 +112,7 @@ pipeline {
                             stage('Publish docker images') {
                                 agent {
                                     kubernetes {
-                                        label "${OS_NAME}-${BINARY_VERSION}-publish-${env.BUILD_NUMBER}"
+                                        label "${OS_NAME}-${BINARY_VERSION}-publish-${env.PIPELINE_NAME}-${env.BUILD_NUMBER}"
                                         defaultContainer 'jnlp'
                                         yamlFile 'ci/jenkins/pod/docker-pod.yaml'
                                     }
@@ -140,7 +140,7 @@ pipeline {
 
                                 agent {
                                     kubernetes {
-                                        label "${OS_NAME}-${BINARY_VERSION}-dev-test-${env.BUILD_NUMBER}"
+                                        label "${OS_NAME}-${BINARY_VERSION}-dev-test-${env.PIPELINE_NAME}-${env.BUILD_NUMBER}"
                                         defaultContainer 'jnlp'
                                         yamlFile 'ci/jenkins/pod/testEnvironment.yaml'
                                     }
diff --git a/ci/jenkins/step/deploySingle2Dev.groovy b/ci/jenkins/step/deploySingle2Dev.groovy
index edb1c62a5f..3a5854b58d 100644
--- a/ci/jenkins/step/deploySingle2Dev.groovy
+++ b/ci/jenkins/step/deploySingle2Dev.groovy
@@ -1,3 +1,4 @@
+sh 'helm version'
 sh 'helm repo add stable https://kubernetes.oss-cn-hangzhou.aliyuncs.com/charts'
 sh 'helm repo update'
 dir ('milvus-helm') {