Commit 4d98ebc1 authored by quicksilver's avatar quicksilver
Browse files

update milvus gpu version build enviroment Dockerfile

parent 6eafced8

ci/jenkins/step/singleDevNightlyTest.groovy

+18 −18
Original line number Diff line number Diff line
@@ -4,23 +4,23 @@ timeout(time: 90, unit: 'MINUTES') { 
        sh "pytest . --alluredir=\"test_out/dev/single/sqlite\" --ip ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-${env.BINRARY_VERSION}-milvus-engine.milvus.svc.cluster.local"

    }

    // mysql database backend test

    // load "${env.WORKSPACE}/ci/jenkins/jenkinsfile/cleanupSingleDev.groovy"

    load "${env.WORKSPACE}/ci/jenkins/jenkinsfile/cleanupSingleDev.groovy"



    // if (!fileExists('milvus-helm')) {

    //     dir ("milvus-helm") {

    //         checkout([$class: 'GitSCM', branches: [[name: "0.6.0"]], userRemoteConfigs: [[url: "https://github.com/milvus-io/milvus-helm.git", name: 'origin', refspec: "+refs/heads/0.5.0:refs/remotes/origin/0.5.0"]]])

    //     }

    // }

    // dir ("milvus-helm") {

    //     dir ("milvus") {

    //         if ("${env.BINRARY_VERSION}" == "gpu") {

    //             sh "helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-${env.BINRARY_VERSION} -f gpu_values.yaml -f ci/db_backend/mysql_values.yaml -f ci/filebeat/values.yaml --namespace milvus ."

    //         } else {

    //             sh "helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-${env.BINRARY_VERSION} -f ci/db_backend/mysql_values.yaml -f ci/filebeat/values.yaml --namespace milvus ."

    //         }

    //     }

    // }

    // dir ("tests/milvus_python_test") {

    //     sh "pytest . --alluredir=\"test_out/dev/single/mysql\" --ip ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-${env.BINRARY_VERSION}-milvus-engine.milvus.svc.cluster.local"

    // }

    if (!fileExists('milvus-helm')) {

        dir ("milvus-helm") {

            checkout([$class: 'GitSCM', branches: [[name: "0.6.0"]], userRemoteConfigs: [[url: "https://github.com/milvus-io/milvus-helm.git", name: 'origin', refspec: "+refs/heads/0.5.0:refs/remotes/origin/0.5.0"]]])

        }

    }

    dir ("milvus-helm") {

        dir ("milvus") {

            if ("${env.BINRARY_VERSION}" == "gpu") {

                sh "helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-${env.BINRARY_VERSION} -f gpu_values.yaml -f ci/db_backend/mysql_values.yaml -f ci/filebeat/values.yaml --namespace milvus ."

            } else {

                sh "helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-${env.BINRARY_VERSION} -f ci/db_backend/mysql_values.yaml -f ci/filebeat/values.yaml --namespace milvus ."

            }

        }

    }

    dir ("tests/milvus_python_test") {

        sh "pytest . --alluredir=\"test_out/dev/single/mysql\" --ip ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-${env.BINRARY_VERSION}-milvus-engine.milvus.svc.cluster.local"

    }

}

docker/build_env/gpu/ubuntu16.04/Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -11,13 +11,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends wget && \ 
    git flex bison gfortran lsb-core \

    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 && \

    lcov mysql-client libmysqlclient-dev intel-mkl-gnu-2019.5-281 intel-mkl-core-2019.5-281 && \

    apt-get remove --purge -y && \

    rm -rf /var/lib/apt/lists/*



RUN ln -s /usr/lib/x86_64-linux-gnu/libmysqlclient.so /usr/lib/x86_64-linux-gnu/libmysqlclient_r.so



RUN sh -c 'echo export LD_LIBRARY_PATH=/opt/intel/compilers_and_libraries_2019.4.243/linux/mkl/lib/intel64:\$LD_LIBRARY_PATH > /etc/profile.d/mkl.sh'

RUN sh -c 'echo export LD_LIBRARY_PATH=/opt/intel/compilers_and_libraries_2019.5.281/linux/mkl/lib/intel64:\$LD_LIBRARY_PATH > /etc/profile.d/mkl.sh'



COPY docker-entrypoint.sh /app/docker-entrypoint.sh

ENTRYPOINT [ "/app/docker-entrypoint.sh" ]

docker/build_env/gpu/ubuntu18.04/Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -11,13 +11,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends wget && \ 
    git flex bison gfortran lsb-core \

    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 && \

    lcov mysql-client libmysqlclient-dev intel-mkl-gnu-2019.5-281 intel-mkl-core-2019.5-281 && \

    apt-get remove --purge -y && \

    rm -rf /var/lib/apt/lists/*



RUN ln -s /usr/lib/x86_64-linux-gnu/libmysqlclient.so /usr/lib/x86_64-linux-gnu/libmysqlclient_r.so



RUN sh -c 'echo export LD_LIBRARY_PATH=/opt/intel/compilers_and_libraries_2019.4.243/linux/mkl/lib/intel64:\$LD_LIBRARY_PATH > /etc/profile.d/mkl.sh'

RUN sh -c 'echo export LD_LIBRARY_PATH=/opt/intel/compilers_and_libraries_2019.5.281/linux/mkl/lib/intel64:\$LD_LIBRARY_PATH > /etc/profile.d/mkl.sh'



COPY docker-entrypoint.sh /app/docker-entrypoint.sh

ENTRYPOINT [ "/app/docker-entrypoint.sh" ]