Commit bec1f509 authored by jinhai's avatar jinhai
Browse files

Merge branch '0.5.1' of http://192.168.1.105:6060/jinhai/milvus into 0.5.1 


Former-commit-id: 16c0cab009b16fd36ec92d02f48fa4b729a5f8eb
parents a8651dba 461e15ab

CHANGELOG.md

+4 −0
Original line number Diff line number Diff line
@@ -5,12 +5,14 @@ Please mark all change in change log and use the ticket from JIRA. 
# Milvus 0.5.1 (TODO)



## Bug

- \#134 - JFrog cache error



## Feature

- \#90 - The server start error messages could be improved to enhance user experience

- \#104 - test_scheduler core dump

- \#115 - Using new structure for tasktable

- \#139 - New config opion use_gpu_threshold

- \#146 - Add only GPU and only CPU version for IVF_SQ8 and IVF_FLAT



## Improvement

- \#64 - Improvement dump function in scheduler
@@ -21,6 +23,8 @@ Please mark all change in change log and use the ticket from JIRA. 
- \#118 - Using shared_ptr instead of weak_ptr to avoid performance loss

- \#122 - Add unique id for Job

- \#130 - Set task state MOVED after resource copy it completed

- \#149 - Improve large query optimizer pass

- \#156 - Not return error when search_resources and index_build_device set cpu



## Task

ci/jenkins/Jenkinsfile

+11 −10
Original line number Diff line number Diff line 
#!/usr/bin/env groovy



String cron_timezone = "TZ=Asia/Shanghai"

String cron_string = BRANCH_NAME == "master" ? "H 0 * * * " : ""

cron_string =  BRANCH_NAME == "0.5.1" ? "H 1 * * * " : cron_string
@@ -16,7 +18,6 @@ pipeline { 


    parameters{

        choice choices: ['Release', 'Debug'], description: '', name: 'BUILD_TYPE'

        string defaultValue: 'cf1434e7-5a4b-4d25-82e8-88d667aef9e5', description: 'GIT CREDENTIALS ID', name: 'GIT_CREDENTIALS_ID', trim: true

        string defaultValue: 'registry.zilliz.com', description: 'DOCKER REGISTRY URL', name: 'DOKCER_REGISTRY_URL', trim: true

        string defaultValue: 'ba070c98-c8cc-4f7c-b657-897715f359fc', description: 'DOCKER CREDENTIALS ID', name: 'DOCKER_CREDENTIALS_ID', trim: true

        string defaultValue: 'http://192.168.1.202/artifactory/milvus', description: 'JFROG ARTFACTORY URL', name: 'JFROG_ARTFACTORY_URL', trim: true
@@ -56,7 +57,7 @@ pipeline { 
                            steps {

                                container('milvus-build-env') {

                                    script {

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

                                        load "${env.WORKSPACE}/ci/jenkins/step/build.groovy"

                                    }

                                }

                            }
@@ -65,7 +66,7 @@ pipeline { 
                            steps {

                                container('milvus-build-env') {

                                    script {

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

                                        load "${env.WORKSPACE}/ci/jenkins/step/coverage.groovy"

                                    }

                                }

                            }
@@ -74,7 +75,7 @@ pipeline { 
                            steps {

                                container('milvus-build-env') {

                                    script {

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

                                        load "${env.WORKSPACE}/ci/jenkins/step/package.groovy"

                                    }

                                }

                            }
@@ -96,7 +97,7 @@ pipeline { 
                            steps {

                                container('publish-images'){

                                    script {

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

                                        load "${env.WORKSPACE}/ci/jenkins/step/publishImages.groovy"

                                    }

                                }

                            }
@@ -118,7 +119,7 @@ pipeline { 
                            steps {

                                container('milvus-test-env') {

                                    script {

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

                                        load "${env.WORKSPACE}/ci/jenkins/step/deploySingle2Dev.groovy"

                                    }

                                }

                            }
@@ -130,9 +131,9 @@ pipeline { 
                                    script {

                                        boolean isNightlyTest = isTimeTriggeredBuild()

                                        if (isNightlyTest) {

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

                                            load "${env.WORKSPACE}/ci/jenkins/step/singleDevNightlyTest.groovy"

                                        } else {

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

                                            load "${env.WORKSPACE}/ci/jenkins/step/singleDevTest.groovy"

                                        }

                                    }

                                }
@@ -143,7 +144,7 @@ pipeline { 
                            steps {

                                container('milvus-test-env') {

                                    script {

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

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

                                    }

                                }

                            }
@@ -153,7 +154,7 @@ pipeline { 
                        unsuccessful {

                            container('milvus-test-env') {

                                script {

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

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

                                }

                            }

                        }