From b852170b9210a884c9ba683e25f9e81fc76f6bef Mon Sep 17 00:00:00 2001 From: milvus-ci-robot Date: Mon, 28 Oct 2019 10:19:07 +0800 Subject: [PATCH 1/4] set cron timezone to Shanghai Former-commit-id: b1f05d796dce95cae1b19c5729ccd4d8da8219c1 --- ci/jenkins/Jenkinsfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ci/jenkins/Jenkinsfile b/ci/jenkins/Jenkinsfile index 0a16c7f2c3..15663183ab 100644 --- a/ci/jenkins/Jenkinsfile +++ b/ci/jenkins/Jenkinsfile @@ -1,10 +1,14 @@ +String cron_timezone = "TZ=Asia/Shanghai" String cron_string = BRANCH_NAME == "master" ? "H 0 * * *" : "" cron_string = BRANCH_NAME == "0.5.1" ? "H 1 * * *" : cron_string pipeline { agent none - triggers { cron(cron_string) } + triggers { + cron("${cron_timezone} + ${cron_string}") + } options { timestamps() From 3e50d77cdc6433c4c3402a4477bf76e30c851343 Mon Sep 17 00:00:00 2001 From: milvus-ci-robot Date: Mon, 28 Oct 2019 10:24:20 +0800 Subject: [PATCH 2/4] set cron timezone to Shanghai Former-commit-id: c4f1a0513722460109d1e681b57a196faedc119d --- ci/jenkins/Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/jenkins/Jenkinsfile b/ci/jenkins/Jenkinsfile index 15663183ab..7c2d83ba59 100644 --- a/ci/jenkins/Jenkinsfile +++ b/ci/jenkins/Jenkinsfile @@ -6,8 +6,8 @@ pipeline { agent none triggers { - cron("${cron_timezone} - ${cron_string}") + cron('''"${cron_timezone}" + "${cron_string}"''') } options { From 60d68defdae9f8c7e57ce4f6a44106fc50ac6eec Mon Sep 17 00:00:00 2001 From: milvus-ci-robot Date: Mon, 28 Oct 2019 10:29:59 +0800 Subject: [PATCH 3/4] set cron timezone to Shanghai Former-commit-id: 28271c43dfae440fd2baa541e846d80d6bf354d8 --- ci/jenkins/Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/jenkins/Jenkinsfile b/ci/jenkins/Jenkinsfile index 7c2d83ba59..67bff5ac1e 100644 --- a/ci/jenkins/Jenkinsfile +++ b/ci/jenkins/Jenkinsfile @@ -1,13 +1,13 @@ String cron_timezone = "TZ=Asia/Shanghai" -String cron_string = BRANCH_NAME == "master" ? "H 0 * * *" : "" -cron_string = BRANCH_NAME == "0.5.1" ? "H 1 * * *" : cron_string +String cron_string = BRANCH_NAME == "master" ? "H 0 * * * " : "" +cron_string = BRANCH_NAME == "0.5.1" ? "H 1 * * * " : cron_string pipeline { agent none triggers { - cron('''"${cron_timezone}" - "${cron_string}"''') + cron """${cron_timezone} + ${cron_string}""" } options { From d76ffe9ab3fd17c7a05422d032fed42404c7695a Mon Sep 17 00:00:00 2001 From: milvus-ci-robot Date: Mon, 28 Oct 2019 11:20:09 +0800 Subject: [PATCH 4/4] update deploySingle2Dev.groovy Former-commit-id: db4fd829b462037db8ce4ebf7b144ddc6b6f5142 --- ci/jenkins/jenkinsfile/deploySingle2Dev.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkins/jenkinsfile/deploySingle2Dev.groovy b/ci/jenkins/jenkinsfile/deploySingle2Dev.groovy index 738c714a0c..bc6c6f4438 100644 --- a/ci/jenkins/jenkinsfile/deploySingle2Dev.groovy +++ b/ci/jenkins/jenkinsfile/deploySingle2Dev.groovy @@ -3,7 +3,7 @@ sh 'helm repo update' dir ('milvus-helm') { checkout([$class: 'GitSCM', branches: [[name: "0.5.0"]], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: "${params.GIT_CREDENTIALS_ID}", url: "https://github.com/milvus-io/milvus-helm.git", name: 'origin', refspec: "+refs/heads/0.5.0:refs/remotes/origin/0.5.0"]]]) dir ("milvus-gpu") { - sh "helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-gpu -f ci/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.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-gpu -f ci/db_backend/sqlite_values.yaml -f ci/filebeat/values.yaml --namespace milvus ." } }