From aad71185271514eaf6684c96c1745e4aa52753a2 Mon Sep 17 00:00:00 2001
From: quicksilver <zhifeng.zhang@zilliz.com>
Date: Wed, 23 Jun 2021 14:20:09 +0800
Subject: [PATCH] Publish Milvus nightly images to DockerHub when the Nightly
 CI is successful (#5998)

Signed-off-by: quicksilver <zhifeng.zhang@zilliz.com>
---
 build/ci/jenkins/Jenkinsfile      |  1 -
 build/ci/jenkins/NightlyCI.groovy | 39 +++++++++++++++++--------------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/build/ci/jenkins/Jenkinsfile b/build/ci/jenkins/Jenkinsfile
index fbe4b41a7f..be039a9e13 100644
--- a/build/ci/jenkins/Jenkinsfile
+++ b/build/ci/jenkins/Jenkinsfile
@@ -35,7 +35,6 @@ pipeline {
                     IMAGE_REPO = "dockerhub-mirror-sh.zilliz.cc/milvusdb"
                     DOCKER_BUILDKIT = 1
                     ARTIFACTS = "${env.WORKSPACE}/artifacts"
-                    MILVUS_HELM_BRANCH = "rename"
                 }
                 stages {
                     stage('Test') {
diff --git a/build/ci/jenkins/NightlyCI.groovy b/build/ci/jenkins/NightlyCI.groovy
index a75cf2313f..653f7ac54e 100644
--- a/build/ci/jenkins/NightlyCI.groovy
+++ b/build/ci/jenkins/NightlyCI.groovy
@@ -41,10 +41,8 @@ pipeline {
                     IMAGE_REPO = "dockerhub-mirror-sh.zilliz.cc/milvusdb"
                     DOCKER_BUILDKIT = 1
                     ARTIFACTS = "${env.WORKSPACE}/artifacts"
-                    DOCKER_CREDENTIALS_ID = "ba070c98-c8cc-4f7c-b657-897715f359fc"
-                    DOKCER_REGISTRY_URL = "registry.zilliz.com"
-                    TARGET_REPO = "${DOKCER_REGISTRY_URL}/milvus"
-                    MILVUS_HELM_BRANCH = "rename"
+                    DOCKER_CREDENTIALS_ID = "f0aacc8e-33f2-458a-ba9e-2c44f431b4d2"
+                    TARGET_REPO = "milvusdb"
                 }
                 stages {
                     stage('Test') {
@@ -83,20 +81,6 @@ pipeline {
                     always {
                         container('main') {
                             script {
-                                def date = sh(returnStdout: true, script: 'date +%Y%m%d').trim()
-                                def gitShortCommit = sh(returnStdout: true, script: 'git rev-parse --short HEAD').trim()
-
-                                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 tag localhost:5000/milvus:latest ${TARGET_REPO}/milvus:${env.BRANCH_NAME}-${date}-${gitShortCommit}
-                                        docker tag localhost:5000/milvus:latest ${TARGET_REPO}/milvus:${env.BRANCH_NAME}-latest
-                                        docker push ${TARGET_REPO}/milvus:${env.BRANCH_NAME}-${date}-${gitShortCommit}
-                                        docker push ${TARGET_REPO}/milvus:${env.BRANCH_NAME}-latest
-                                    """
-                                    sh 'docker logout ${DOKCER_REGISTRY_URL}'
-                                }
-
                                 dir("${env.ARTIFACTS}") {
                                     sh "find ./kind -path '*/history/*' -type f | xargs tar -zcvf artifacts-${PROJECT_NAME}-${MILVUS_SERVER_TYPE}-${SEMVER}-${env.BUILD_NUMBER}-e2e-nightly-logs.tar.gz --transform='s:^[^/]*/[^/]*/[^/]*/[^/]*/::g' || true"
                                     archiveArtifacts artifacts: "**.tar.gz", allowEmptyArchive: true
@@ -106,6 +90,25 @@ pipeline {
                             }
                         }
                     }
+                    success {
+                        container('main') {
+                            script {
+                                def date = sh(returnStdout: true, script: 'date +%Y%m%d').trim()
+                                def gitShortCommit = sh(returnStdout: true, script: 'git rev-parse --short HEAD').trim()
+
+                                withCredentials([usernamePassword(credentialsId: "${env.DOCKER_CREDENTIALS_ID}", usernameVariable: 'DOCKER_USERNAME', passwordVariable: 'DOCKER_PASSWORD')]) {
+                                    sh 'docker login -u ${DOCKER_USERNAME} -p ${DOCKER_PASSWORD}'
+                                    sh """
+                                        docker tag localhost:5000/milvus:latest ${TARGET_REPO}/milvus-nightly:${env.BRANCH_NAME}-${date}-${gitShortCommit}
+                                        docker tag localhost:5000/milvus:latest ${TARGET_REPO}/milvus-nightly:${env.BRANCH_NAME}-latest
+                                        docker push ${TARGET_REPO}/milvus-nightly:${env.BRANCH_NAME}-${date}-${gitShortCommit}
+                                        docker push ${TARGET_REPO}/milvus-nightly:${env.BRANCH_NAME}-latest
+                                    """
+                                    sh 'docker logout'
+                                }
+                            }
+                        }
+                    }
                     cleanup {
                         container('main') {
                             script {