From 0bac5db170daa3bc99c2092685d678d863e0890e Mon Sep 17 00:00:00 2001
From: quicksilver <zhifeng.zhang@zilliz.com>
Date: Tue, 5 Nov 2019 11:55:52 +0800
Subject: [PATCH] update server configure file on pack stage

---
 ci/jenkins/step/package.groovy            | 4 ++++
 ci/jenkins/yaml/update_server_config.yaml | 2 ++
 docker/build_env/ubuntu16.04/Dockerfile   | 2 +-
 docker/build_env/ubuntu18.04/Dockerfile   | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 ci/jenkins/yaml/update_server_config.yaml

diff --git a/ci/jenkins/step/package.groovy b/ci/jenkins/step/package.groovy
index edd6ce88da..c07dcd9d88 100644
--- a/ci/jenkins/step/package.groovy
+++ b/ci/jenkins/step/package.groovy
@@ -1,4 +1,8 @@
 timeout(time: 5, unit: 'MINUTES') {
+    dir ("ci/jenkins/scripts") {
+        sh "pip3 install -r requirements.txt"
+        sh "./yaml_processor.py merge -f /opt/milvus/conf/server_config.yaml -m ../yaml/update_server_config.yaml -i && rm /opt/milvus/conf/server_config.yaml.bak"
+    }
     sh "tar -zcvf ./${PROJECT_NAME}-${PACKAGE_VERSION}.tar.gz -C /opt/ milvus"
     withCredentials([usernamePassword(credentialsId: "${params.JFROG_CREDENTIALS_ID}", usernameVariable: 'JFROG_USERNAME', passwordVariable: 'JFROG_PASSWORD')]) {
         def uploadStatus = sh(returnStatus: true, script: "curl -u${JFROG_USERNAME}:${JFROG_PASSWORD} -T ./${PROJECT_NAME}-${PACKAGE_VERSION}.tar.gz ${params.JFROG_ARTFACTORY_URL}/milvus/package/${PROJECT_NAME}-${PACKAGE_VERSION}.tar.gz")
diff --git a/ci/jenkins/yaml/update_server_config.yaml b/ci/jenkins/yaml/update_server_config.yaml
new file mode 100644
index 0000000000..072c6f2c9e
--- /dev/null
+++ b/ci/jenkins/yaml/update_server_config.yaml
@@ -0,0 +1,2 @@
+db_config:
+  primary_path: /opt/milvus
diff --git a/docker/build_env/ubuntu16.04/Dockerfile b/docker/build_env/ubuntu16.04/Dockerfile
index 7b1943f578..a93ce83f72 100644
--- a/docker/build_env/ubuntu16.04/Dockerfile
+++ b/docker/build_env/ubuntu16.04/Dockerfile
@@ -9,7 +9,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends wget && \
     sh -c 'echo deb https://apt.repos.intel.com/mkl all main > /etc/apt/sources.list.d/intel-mkl.list' && \
     apt-get update && apt-get install -y --no-install-recommends \
     git flex bison gfortran lsb-core \
-    curl libtool automake libboost1.58-all-dev libssl-dev pkg-config libcurl4-openssl-dev \
+    curl libtool automake libboost1.58-all-dev libssl-dev pkg-config libcurl4-openssl-dev python3-pip \
     clang-format-6.0 clang-tidy-6.0 \
     lcov mysql-client libmysqlclient-dev intel-mkl-gnu-2019.4-243 intel-mkl-core-2019.4-243 && \
     apt-get remove --purge -y && \
diff --git a/docker/build_env/ubuntu18.04/Dockerfile b/docker/build_env/ubuntu18.04/Dockerfile
index 60d881428b..7f7353de31 100644
--- a/docker/build_env/ubuntu18.04/Dockerfile
+++ b/docker/build_env/ubuntu18.04/Dockerfile
@@ -9,7 +9,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends wget && \
     sh -c 'echo deb https://apt.repos.intel.com/mkl all main > /etc/apt/sources.list.d/intel-mkl.list' && \
     apt-get update && apt-get install -y --no-install-recommends \
     git flex bison gfortran lsb-core \
-    curl libtool automake libboost-all-dev libssl-dev pkg-config libcurl4-openssl-dev \
+    curl libtool automake libboost-all-dev libssl-dev pkg-config libcurl4-openssl-dev python3-pip \
     clang-format-6.0 clang-tidy-6.0 \
     lcov mysql-client libmysqlclient-dev intel-mkl-gnu-2019.4-243 intel-mkl-core-2019.4-243 && \
     apt-get remove --purge -y && \