From af5e32d00bea960f858de3d2d137e5a5daaab711 Mon Sep 17 00:00:00 2001 From: yellow-shine Date: Wed, 6 Nov 2024 10:24:30 +0800 Subject: [PATCH] enhance: refine the pipeline (#37456) https://github.com/milvus-io/milvus/pull/37412 --------- Signed-off-by: Yellow Shine --- ci/jenkins/Nightly2.groovy | 3 ++- ci/jenkins/PR.groovy | 10 +++++++++- scripts/3rdparty_build.sh | 7 ++++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ci/jenkins/Nightly2.groovy b/ci/jenkins/Nightly2.groovy index 3b609e9c27..985c9d5033 100644 --- a/ci/jenkins/Nightly2.groovy +++ b/ci/jenkins/Nightly2.groovy @@ -1,4 +1,4 @@ -@Library('jenkins-shared-library@v0.61.0') _ +@Library('jenkins-shared-library@v0.67.0') _ def pod = libraryResource 'io/milvus/pod/tekton-4am.yaml' @@ -56,6 +56,7 @@ pipeline { gitBaseRef: gitBaseRef, pullRequestNumber: "$env.CHANGE_ID", suppress_suffix_of_image_tag: true, + make_cmd: "make clean && make install use_disk_index=ON", images: '["milvus","pytest","helm"]', tekton_log_timeout: '30m' diff --git a/ci/jenkins/PR.groovy b/ci/jenkins/PR.groovy index 29ae521193..99bbcf0ee0 100644 --- a/ci/jenkins/PR.groovy +++ b/ci/jenkins/PR.groovy @@ -1,4 +1,4 @@ -@Library('jenkins-shared-library@v0.61.0') _ +@Library('jenkins-shared-library@v0.67.0') _ def pod = libraryResource 'io/milvus/pod/tekton-4am.yaml' def milvus_helm_chart_version = '4.2.8' @@ -10,6 +10,13 @@ pipeline { buildDiscarder logRotator(artifactDaysToKeepStr: '30') preserveStashes(buildCount: 5) disableConcurrentBuilds(abortPrevious: true) + timeout(time: 6, unit: 'HOURS') + throttleJobProperty( + categories: ['cpu-e2e'], + throttleEnabled: true, + throttleOption: 'category' + + ) } agent { kubernetes { @@ -43,6 +50,7 @@ pipeline { gitBaseRef: gitBaseRef, pullRequestNumber: "$env.CHANGE_ID", suppress_suffix_of_image_tag: true, + make_cmd: "make clean && make install use_disk_index=ON", images: '["milvus","pytest","helm"]' milvus_image_tag = tekton.query_result job_name, 'milvus-image-tag' diff --git a/scripts/3rdparty_build.sh b/scripts/3rdparty_build.sh index 2c894ba972..ec8c6af25c 100644 --- a/scripts/3rdparty_build.sh +++ b/scripts/3rdparty_build.sh @@ -52,9 +52,14 @@ pushd ${BUILD_OUTPUT_DIR} export CONAN_REVISIONS_ENABLED=1 export CXXFLAGS="-Wno-error=address -Wno-error=deprecated-declarations" export CFLAGS="-Wno-error=address -Wno-error=deprecated-declarations" + +# Determine the Conan remote URL, using the environment variable if set, otherwise defaulting +CONAN_ARTIFACTORY_URL="${CONAN_ARTIFACTORY_URL:-https://milvus01.jfrog.io/artifactory/api/conan/default-conan-local}" + if [[ ! `conan remote list` == *default-conan-local* ]]; then - conan remote add default-conan-local https://milvus01.jfrog.io/artifactory/api/conan/default-conan-local + conan remote add default-conan-local $CONAN_ARTIFACTORY_URL fi + unameOut="$(uname -s)" case "${unameOut}" in Darwin*)