Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enhance: refine the pipeline #37456

Merged
merged 3 commits into from
Nov 6, 2024
Merged

enhance: refine the pipeline #37456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2dfe285
enhance: allow to change conan repo url
yellow-shine Nov 4, 2024
5c2ddbc
enhance: add throttle for cpu-e2e and cpp-unit-test pipeline
yellow-shine Nov 5, 2024
e850e3e
enhance: pass make_cmd
yellow-shine Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ci/jenkins/Nightly2.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'

Expand Down Expand Up @@ -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'

Expand Down
10 changes: 9 additions & 1 deletion ci/jenkins/PR.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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 {
Expand Down Expand Up @@ -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'
Expand Down
7 changes: 6 additions & 1 deletion scripts/3rdparty_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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*)
Expand Down
Loading