Merge branch 'branch-0.3.1' into 'branch-0.3.1'

fix nightly_main_jenkinsfile docker version bug

See merge request megasearch/milvus!172

Former-commit-id: bcb77b7d3c08e9a905b472fcab0cddfa81213b23
This commit is contained in:
Jeff 2019-07-09 15:07:20 +08:00
commit da7f9afffb

View File

@ -11,7 +11,7 @@ pipeline {
SEMVER = "${env.gitlabSourceBranch == null ? params.ENGINE_BRANCH.substring(params.ENGINE_BRANCH.lastIndexOf('/') + 1) : env.gitlabSourceBranch}"
GITLAB_AFTER_COMMIT = "${env.gitlabAfter == null ? null : env.gitlabAfter}"
SUFFIX_VERSION_NAME = "${env.gitlabAfter == null ? null : env.gitlabAfter.substring(0, 6)}"
DOCKER_VERSION_STR = "${env.gitlabAfter == null ? "${SEMVER}-${LOWER_BUILD_TYPE}-\$\{BUILD_DATE_FORMATTED\, \"yyyyMMdd\"\}" : "${SEMVER}-${LOWER_BUILD_TYPE}-${SUFFIX_VERSION_NAME}"}"
DOCKER_VERSION_STR = "${env.gitlabAfter == null ? '${SEMVER}-${LOWER_BUILD_TYPE}-${BUILD_DATE_FORMATTED, \"yyyyMMdd\"}' : '${SEMVER}-${LOWER_BUILD_TYPE}-${SUFFIX_VERSION_NAME}'}"
}
stages {