From 37487a8fee0ddf404a48119933bb47cbb0949703 Mon Sep 17 00:00:00 2001
From: ZhifengZhang-CN <zhifeng.zhang@zilliz.com>
Date: Wed, 13 Nov 2019 13:55:46 +0800
Subject: [PATCH] fix make error

---
 ci/jenkins/step/build.groovy | 2 +-
 core/CMakeLists.txt          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/jenkins/step/build.groovy b/ci/jenkins/step/build.groovy
index ee0ca020a6..bae4259a6f 100644
--- a/ci/jenkins/step/build.groovy
+++ b/ci/jenkins/step/build.groovy
@@ -1,7 +1,7 @@
 timeout(time: 60, unit: 'MINUTES') {
     dir ("ci/scripts") {
         withCredentials([usernamePassword(credentialsId: "${params.JFROG_CREDENTIALS_ID}", usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
-            sh "export JFROG_ARTFACTORY_URL='${params.JFROG_ARTFACTORY_URL}' && export JFROG_USER_NAME='${USERNAME}' && export JFROG_PASSWORD='${PASSWORD}' && ./build.sh -t ${params.BUILD_TYPE} -o /opt/milvus -l -j -u -c"
+            sh "export JFROG_ARTFACTORY_URL='${params.JFROG_ARTFACTORY_URL}' && export JFROG_USER_NAME='${USERNAME}' && export JFROG_PASSWORD='${PASSWORD}' && ./build.sh -t ${params.BUILD_TYPE} -o /opt/milvus -l -g -j -u -c"
         }
     }
 }
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index bacab79612..d2ba516fec 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -178,7 +178,7 @@ endif ()
 if (MILVUS_GPU_VERSION)
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/conf/server_gpu_config.template ${CMAKE_CURRENT_SOURCE_DIR}/conf/server_config.yaml)
 else()
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/conf/server_config.template ${CMAKE_CURRENT_SOURCE_DIR}/conf/server_config.yaml)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/conf/server_cpu_config.template ${CMAKE_CURRENT_SOURCE_DIR}/conf/server_config.yaml)
 endif()
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/conf/log_config.template ${CMAKE_CURRENT_SOURCE_DIR}/conf/log_config.conf)