diff --git a/ci/jenkins/step/build.groovy b/ci/jenkins/step/build.groovy index 71643bef51..9034c936ec 100644 --- a/ci/jenkins/step/build.groovy +++ b/ci/jenkins/step/build.groovy @@ -3,17 +3,9 @@ timeout(time: 60, unit: 'MINUTES') { withCredentials([usernamePassword(credentialsId: "${params.JFROG_CREDENTIALS_ID}", usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) { def checkResult = sh(script: "./check_ccache.sh -l ${params.JFROG_ARTFACTORY_URL}/ccache", returnStatus: true) if ("${BINRARY_VERSION}" == "gpu") { - if ("${OS_NAME}" == "centos7") { - sh ". ./before-install.sh && source scl_source enable devtoolset-7 && source scl_source enable llvm-toolset-7.0 && ./build.sh -t ${params.BUILD_TYPE} -o ${env.MILVUS_INSTALL_PREFIX} -l -g -u -c" - } else { - sh ". ./before-install.sh && ./build.sh -t ${params.BUILD_TYPE} -o ${env.MILVUS_INSTALL_PREFIX} -l -g -u -c" - } + sh "/bin/bash --login -c \". ./before-install.sh && ./build.sh -t ${params.BUILD_TYPE} -o ${env.MILVUS_INSTALL_PREFIX} -l -g -u -c\"" } else { - if ("${OS_NAME}" == "centos7") { - sh ". ./before-install.sh && source scl_source enable devtoolset-7 && source scl_source enable llvm-toolset-7.0 && ./build.sh -t ${params.BUILD_TYPE} -o ${env.MILVUS_INSTALL_PREFIX} -l -u -c" - } else { - sh ". ./before-install.sh && ./build.sh -t ${params.BUILD_TYPE} -o ${env.MILVUS_INSTALL_PREFIX} -l -u -c" - } + sh "/bin/bash --login -c \". ./before-install.sh && ./build.sh -t ${params.BUILD_TYPE} -o ${env.MILVUS_INSTALL_PREFIX} -l -u -c\"" } sh "./update_ccache.sh -l ${params.JFROG_ARTFACTORY_URL}/ccache -u ${USERNAME} -p ${PASSWORD}" } diff --git a/ci/scripts/base.info b/ci/scripts/base.info new file mode 100644 index 0000000000..e69de29bb2 diff --git a/ci/scripts/server.info b/ci/scripts/server.info new file mode 100644 index 0000000000..e69de29bb2 diff --git a/docker-compose.yml b/docker-compose.yml index 4eda37f488..59b3e7ce46 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -59,9 +59,7 @@ services: networks: - milvus command: ¢os-command > - /bin/bash -c " - source scl_source enable devtoolset-7 - source scl_source enable llvm-toolset-7.0 + /bin/bash --login -c " /milvus/ci/scripts/build.sh -t Release -o ${MILVUS_INSTALL_PREFIX} -l -u -c /milvus/ci/scripts/coverage.sh -o ${MILVUS_INSTALL_PREFIX} -u root -p 123456 -t mysql"