From 3e8e70115b7cc9a9b9c0703db9f109abcb4ccca5 Mon Sep 17 00:00:00 2001
From: quicksilver <zhifeng.zhang@zilliz.com>
Date: Wed, 18 Dec 2019 17:22:12 +0800
Subject: [PATCH] update Jenkins CI

---
 ci/jenkins/pod/milvus-cpu-version-centos7-build-env-pod.yaml   | 2 --
 .../pod/milvus-cpu-version-ubuntu18.04-build-env-pod.yaml      | 2 --
 ci/jenkins/pod/milvus-gpu-version-centos7-build-env-pod.yaml   | 2 --
 .../pod/milvus-gpu-version-ubuntu18.04-build-env-pod.yaml      | 2 --
 ci/scripts/check_ccache.sh                                     | 3 +--
 ci/scripts/update_ccache.sh                                    | 3 +--
 6 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/ci/jenkins/pod/milvus-cpu-version-centos7-build-env-pod.yaml b/ci/jenkins/pod/milvus-cpu-version-centos7-build-env-pod.yaml
index f1628247..6091a01e 100644
--- a/ci/jenkins/pod/milvus-cpu-version-centos7-build-env-pod.yaml
+++ b/ci/jenkins/pod/milvus-cpu-version-centos7-build-env-pod.yaml
@@ -16,8 +16,6 @@ spec:
           fieldPath: status.podIP
     - name: OS_NAME
       value: "centos7"
-    - name: BINARY_VERSION
-      value: "cpu"
     - name: BUILD_ENV_IMAGE_ID
       value: "225b4d9c26d67b70b476964b4dd6e216de4b464d7a973a8c0c7ed1313c4d81ad"
     command:
diff --git a/ci/jenkins/pod/milvus-cpu-version-ubuntu18.04-build-env-pod.yaml b/ci/jenkins/pod/milvus-cpu-version-ubuntu18.04-build-env-pod.yaml
index 1c3fdc4b..4689da5d 100644
--- a/ci/jenkins/pod/milvus-cpu-version-ubuntu18.04-build-env-pod.yaml
+++ b/ci/jenkins/pod/milvus-cpu-version-ubuntu18.04-build-env-pod.yaml
@@ -16,8 +16,6 @@ spec:
           fieldPath: status.podIP
     - name: OS_NAME
       value: "ubuntu18.04"
-    - name: BINARY_VERSION
-      value: "cpu"
     - name: BUILD_ENV_IMAGE_ID
       value: "23476391bec80c64f10d44a6370c73c71f011a6b95114b10ff82a60e771e11c7"
     command:
diff --git a/ci/jenkins/pod/milvus-gpu-version-centos7-build-env-pod.yaml b/ci/jenkins/pod/milvus-gpu-version-centos7-build-env-pod.yaml
index de3ce616..34da55a9 100644
--- a/ci/jenkins/pod/milvus-gpu-version-centos7-build-env-pod.yaml
+++ b/ci/jenkins/pod/milvus-gpu-version-centos7-build-env-pod.yaml
@@ -16,8 +16,6 @@ spec:
           fieldPath: status.podIP
     - name: OS_NAME
       value: "centos7"
-    - name: BINARY_VERSION
-      value: "gpu"
     - name: BUILD_ENV_IMAGE_ID
       value: "a5ec9914737ea4727d88ae36b4a73ca5d817f19438ba913cc1de6a1ee2ed2336"
     command:
diff --git a/ci/jenkins/pod/milvus-gpu-version-ubuntu18.04-build-env-pod.yaml b/ci/jenkins/pod/milvus-gpu-version-ubuntu18.04-build-env-pod.yaml
index 8f941df6..95b47c91 100644
--- a/ci/jenkins/pod/milvus-gpu-version-ubuntu18.04-build-env-pod.yaml
+++ b/ci/jenkins/pod/milvus-gpu-version-ubuntu18.04-build-env-pod.yaml
@@ -16,8 +16,6 @@ spec:
           fieldPath: status.podIP
     - name: OS_NAME
       value: "ubuntu18.04"
-    - name: BINARY_VERSION
-      value: "gpu"
     - name: BUILD_ENV_IMAGE_ID
       value: "da9023b0f858f072672f86483a869aa87e90a5140864f89e5a012ec766d96dea"
     command:
diff --git a/ci/scripts/check_ccache.sh b/ci/scripts/check_ccache.sh
index 98f95be7..c9c03ef1 100755
--- a/ci/scripts/check_ccache.sh
+++ b/ci/scripts/check_ccache.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 OS_NAME="${OS_NAME}"
-BINARY_VERSION="${BINARY_VERSION}"
 BUILD_ENV_DOCKER_IMAGE_ID="${BUILD_ENV_IMAGE_ID}"
 BRANCH_NAMES=$(git log --decorate | head -n 1 | sed 's/.*(\(.*\))/\1/' | sed 's=[a-zA-Z]*\/==g' | awk -F", " '{$1=""; print $0}')
 ARTIFACTORY_URL=""
@@ -43,7 +42,7 @@ fi
 
 check_ccache() {
     BRANCH=$1
-    PACKAGE_FILE="ccache-${OS_NAME}-${BINARY_VERSION}-${BUILD_ENV_DOCKER_IMAGE_ID}.tar.gz"
+    PACKAGE_FILE="ccache-${OS_NAME}-${BUILD_ENV_DOCKER_IMAGE_ID}.tar.gz"
     echo "fetching ${BRANCH}/${PACKAGE_FILE}"
     wget -q --spider "${ARTIFACTORY_URL}/${BRANCH}/${PACKAGE_FILE}"
     if [[ $? == 0 ]];then
diff --git a/ci/scripts/update_ccache.sh b/ci/scripts/update_ccache.sh
index 605714fe..ec52bd11 100755
--- a/ci/scripts/update_ccache.sh
+++ b/ci/scripts/update_ccache.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 OS_NAME="${OS_NAME}"
-BINARY_VERSION="${BINARY_VERSION}"
 BUILD_ENV_DOCKER_IMAGE_ID="${BUILD_ENV_IMAGE_ID}"
 BRANCH_NAME=$(git log --decorate | head -n 1 | sed 's/.*(\(.*\))/\1/' | sed 's/.*, //' | sed 's=[a-zA-Z]*\/==g')
 ARTIFACTORY_URL=""
@@ -51,7 +50,7 @@ if [[ -z "${ARTIFACTORY_URL}" || "${ARTIFACTORY_URL}" == "" ]];then
     exit 1
 fi
 
-PACKAGE_FILE="ccache-${OS_NAME}-${BINARY_VERSION}-${BUILD_ENV_DOCKER_IMAGE_ID}.tar.gz"
+PACKAGE_FILE="ccache-${OS_NAME}-${BUILD_ENV_DOCKER_IMAGE_ID}.tar.gz"
 REMOTE_PACKAGE_PATH="${ARTIFACTORY_URL}/${BRANCH_NAME}"
 
 ccache --show-stats
-- 
GitLab