From 7cea9f641bdabfddc16e8a4d2efdddcce279b87c Mon Sep 17 00:00:00 2001 From: yellow-shine Date: Tue, 27 Aug 2024 14:23:05 +0800 Subject: [PATCH] enhance: refine go-sdk pipeline (#35647) Signed-off-by: Yellow Shine --- ci/jenkins/PR-for-go-sdk.groovy | 77 ++++++++++++--------------------- 1 file changed, 27 insertions(+), 50 deletions(-) diff --git a/ci/jenkins/PR-for-go-sdk.groovy b/ci/jenkins/PR-for-go-sdk.groovy index 41ff0dc031..d47f8f6d47 100644 --- a/ci/jenkins/PR-for-go-sdk.groovy +++ b/ci/jenkins/PR-for-go-sdk.groovy @@ -1,9 +1,8 @@ -@Library('jenkins-shared-library@v0.6.14') _ - -def store = new java.util.concurrent.ConcurrentHashMap() +@Library('jenkins-shared-library@v0.28.0') _ def pod = libraryResource 'io/milvus/pod/tekton-4am.yaml' -def output = [:] + +def milvus_helm_chart_version = '4.2.8' pipeline { options { @@ -22,7 +21,7 @@ pipeline { stages { stage('build') { steps { - container('kubectl') { + container('tkn') { script { isPr = env.CHANGE_ID != null gitMode = isPr ? 'merge' : 'fetch' @@ -34,18 +33,7 @@ pipeline { gitBaseRef: gitBaseRef, pullRequestNumber: "$env.CHANGE_ID", suppress_suffix_of_image_tag: true - } - } - container('tkn') { - script { - try { - tekton.print_log(job_name) - } catch (Exception e) { - println e - } - - tekton.check_result(job_name) milvus_image_tag = tekton.query_result job_name, 'milvus-image-tag' milvus_sdk_go_image = tekton.query_result job_name, 'gotestsum-image-fqdn' } @@ -55,7 +43,7 @@ pipeline { always { container('tkn') { script { - tekton.sure_stop(job_name) + tekton.sure_stop() } } } @@ -78,56 +66,46 @@ pipeline { stages { stage('E2E Test') { steps { - container('kubectl') { + container('tkn') { script { def helm_release_name = tekton.release_name milvus_deployment_option: milvus_deployment_option, + ciMode: 'e2e', + client: 'gotestsum', changeId: "${env.CHANGE_ID}", buildId:"${env.BUILD_ID}" - job_name = tekton.test helm_release_name: helm_release_name, + job_name = tekton.gotestsum helm_release_name: helm_release_name, + milvus_helm_version: milvus_helm_chart_version, + ciMode: 'e2e', milvus_image_tag: milvus_image_tag, milvus_sdk_go_image: milvus_sdk_go_image, milvus_deployment_option: milvus_deployment_option - - store["${milvus_deployment_option}"] = job_name - } - } - - container('tkn') { - script { - def job_name = store["${milvus_deployment_option}"] - try { - tekton.print_log(job_name) - } catch (Exception e) { - println e - } - - tekton.check_result(job_name) } } } post { always { - container('tkn') { - script { - def job_name = store["${milvus_deployment_option}"] - tekton.sure_stop(job_name) - } + container('tkn') { + script { + tekton.sure_stop() } + } - container('archive') { - script { - def helm_release_name = tekton.release_name milvus_deployment_option: milvus_deployment_option, - changeId: "${env.CHANGE_ID}", - buildId:"${env.BUILD_ID}" + container('archive') { + script { + def helm_release_name = tekton.release_name milvus_deployment_option: milvus_deployment_option, + ciMode: 'e2e', + client: 'gotestsum', + changeId: "${env.CHANGE_ID}", + buildId:"${env.BUILD_ID}" - tekton.archive milvus_deployment_option: milvus_deployment_option, - release_name: helm_release_name , - change_id: env.CHANGE_ID, - build_id: env.BUILD_ID - } + tekton.archive milvus_deployment_option: milvus_deployment_option, + release_name: helm_release_name , + change_id: env.CHANGE_ID, + build_id: env.BUILD_ID } + } } } } @@ -136,4 +114,3 @@ pipeline { } } } -