enhance: [2.3] fix new nightly pipeline (#35751)

https://github.com/milvus-io/milvus/pull/35747

---------

Signed-off-by: Yellow Shine <sammy.huang@zilliz.com>
pull/35768/head
yellow-shine 2024-08-28 15:51:00 +08:00 committed by GitHub
parent 07c22ffb16
commit 3cf453f1a8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 39 additions and 27 deletions

View File

@ -1,6 +1,6 @@
@Library('jenkins-shared-library@v0.29.0') _
@Library('jenkins-shared-library@v0.32.0') _
def pod = libraryResource 'io/milvus/pod/tekton-ci.yaml'
def pod = libraryResource 'io/milvus/pod/tekton-4am.yaml'
String cron_timezone = 'TZ=Asia/Shanghai'
String cron_string = '50 4 * * *'
@ -25,19 +25,33 @@ pipeline {
}
agent {
kubernetes {
cloud '4am'
yaml pod
}
}
stages {
stage('build') {
stage('meta') {
steps {
container('tkn') {
container('jnlp') {
script {
isPr = env.CHANGE_ID != null
gitMode = isPr ? 'merge' : 'fetch'
gitBaseRef = isPr ? "$env.CHANGE_TARGET" : "$env.BRANCH_NAME"
job_name = tekton.run arch: 'amd64',
get_helm_release_name = tekton.helm_release_name client: 'py',
ciMode: 'nightly',
changeId: "${isPr ? env.CHANGE_ID : env.BRANCH_NAME }",
buildId:"${env.BUILD_ID}"
}
}
}
}
stage('build') {
steps {
container('tkn') {
script {
def job_name = tekton.run arch: 'amd64',
isPr: isPr,
gitMode: gitMode ,
gitBaseRef: gitBaseRef,
@ -64,6 +78,7 @@ pipeline {
matrix {
agent {
kubernetes {
cloud '4am'
yaml pod
}
}
@ -78,11 +93,7 @@ pipeline {
steps {
container('tkn') {
script {
def helm_release_name = tekton.release_name milvus_deployment_option: milvus_deployment_option,
ciMode: 'nightly',
client: 'py',
changeId: "${env.CHANGE_ID}",
buildId:"${env.BUILD_ID}"
def helm_release_name = get_helm_release_name milvus_deployment_option
tekton.pytest helm_release_name: helm_release_name,
milvus_helm_version: milvus_helm_chart_version,
@ -104,11 +115,7 @@ pipeline {
container('archive') {
script {
def helm_release_name = tekton.release_name milvus_deployment_option: milvus_deployment_option,
ciMode: 'nightly',
client: 'py',
changeId: "${env.CHANGE_ID}",
buildId:"${env.BUILD_ID}"
def helm_release_name = get_helm_release_name milvus_deployment_option
tekton.archive milvus_deployment_option: milvus_deployment_option,
release_name: helm_release_name ,

View File

@ -1,4 +1,4 @@
@Library('jenkins-shared-library@v0.29.0') _
@Library('jenkins-shared-library@v0.32.0') _
def pod = libraryResource 'io/milvus/pod/tekton-4am.yaml'
def milvus_helm_chart_version = '4.1.27'
@ -18,15 +18,26 @@ pipeline {
}
}
stages {
stage('build') {
stage('meta') {
steps {
container('tkn') {
container('jnlp') {
script {
isPr = env.CHANGE_ID != null
gitMode = isPr ? 'merge' : 'fetch'
gitBaseRef = isPr ? "$env.CHANGE_TARGET" : "$env.BRANCH_NAME"
job_name = tekton.run arch: 'amd64',
get_helm_release_name = tekton.helm_release_name client: 'py',
changeId: "${env.CHANGE_ID}",
buildId:"${env.BUILD_ID}"
}
}
}
}
stage('build') {
steps {
container('tkn') {
script {
def job_name = tekton.run arch: 'amd64',
isPr: isPr,
gitMode: gitMode ,
gitBaseRef: gitBaseRef,
@ -68,10 +79,7 @@ pipeline {
steps {
container('tkn') {
script {
def helm_release_name = tekton.release_name milvus_deployment_option: milvus_deployment_option,
client: 'py',
changeId: "${env.CHANGE_ID}",
buildId:"${env.BUILD_ID}"
def helm_release_name = get_helm_release_name milvus_deployment_option
if (milvus_deployment_option == 'distributed-streaming-service') {
try {
@ -106,10 +114,7 @@ pipeline {
container('archive') {
script {
def helm_release_name = tekton.release_name milvus_deployment_option: milvus_deployment_option,
client: 'py',
changeId: "${env.CHANGE_ID}",
buildId:"${env.BUILD_ID}"
def helm_release_name = get_helm_release_name milvus_deployment_option
tekton.archive milvus_deployment_option: milvus_deployment_option,
release_name: helm_release_name ,