From 70ebc76bc54d8c743114cca055fa2c7d4f2998da Mon Sep 17 00:00:00 2001 From: Liang Huang Date: Sun, 26 May 2024 09:31:56 +0800 Subject: [PATCH 01/33] . Signed-off-by: Liang Huang --- ci/jenkins/PublishImages/Jenkinsfile | 78 ++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 ci/jenkins/PublishImages/Jenkinsfile diff --git a/ci/jenkins/PublishImages/Jenkinsfile b/ci/jenkins/PublishImages/Jenkinsfile new file mode 100644 index 00000000000..a2bfe5d4c5a --- /dev/null +++ b/ci/jenkins/PublishImages/Jenkinsfile @@ -0,0 +1,78 @@ +pipeline { + agent { + kubernetes { + // cloud 'kubernetes' + // label 'jenkins-slave' + // defaultContainer 'jnlp' + // yamlFile 'ci/jenkins/pod/meta-builder.yaml' + yaml ''' + spec: + securityContext: + runAsUser: 1000 # default UID of jenkins user in agent image + containers: + - name: kubectl + image: bitnami/kubectl:1.27.14 + command: + - cat + tty: true + ''' + } + } + stages { + stage('Stage 1') { + steps { + echo 'Hello world!' + } + } + stage('sleep') { + steps { + script { + sleep 1 + } + } + } + stage('list pod') { + steps { + container('kubectl') { + script { + // sh 'kubectl get pod' + // "ls -lah".execute().text.eachLine { line -> + // echo line + // } + + def ret = sh ( script: """ +cat << EOF | kubectl apply -f - +apiVersion: tekton.dev/v1beta1 +kind: TaskRun +metadata: + name: hello-task-run + namespace: milvus-ci +spec: + taskRef: + name: hello +EOF +""", returnStdout: true) + def name = ret.split("/")[1].split(' ')[0] + // def ret = sh(script: 'kubectl ', returnStdout: true) + + sh """ + kubectl logs ${name}-pod -f -n milvus-ci + """ + + sh """ + kubectl describe taskrun ${name} -n milvus-ci + """ + + // "kubectl get pod".execute().text.eachLine { line -> + // echo line + // } + // "tkn task start hello".execute().text.eachLine { line -> + // echo line + // } + // sh 'echo hello' + } + } + } + } + } +} From 9e7b86b61b89c3bf1bac4b3f71ad12fbb4f62b4f Mon Sep 17 00:00:00 2001 From: Liang Huang Date: Thu, 30 May 2024 17:45:51 +0800 Subject: [PATCH 02/33] . Signed-off-by: Liang Huang --- ci/jenkins/PublishImages/Jenkinsfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci/jenkins/PublishImages/Jenkinsfile b/ci/jenkins/PublishImages/Jenkinsfile index a2bfe5d4c5a..1a568fb5933 100644 --- a/ci/jenkins/PublishImages/Jenkinsfile +++ b/ci/jenkins/PublishImages/Jenkinsfile @@ -1,4 +1,7 @@ pipeline { + options { + skipDefaultCheckout true + } agent { kubernetes { // cloud 'kubernetes' @@ -21,6 +24,7 @@ pipeline { stages { stage('Stage 1') { steps { + echo "branch: $env.BRANCH_NAME" echo 'Hello world!' } } From b943db838ec674462e39724fbc5e96473a969d0e Mon Sep 17 00:00:00 2001 From: Liang Huang Date: Thu, 30 May 2024 17:47:37 +0800 Subject: [PATCH 03/33] . Signed-off-by: Liang Huang --- ci/jenkins/PublishImages/Jenkinsfile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ci/jenkins/PublishImages/Jenkinsfile b/ci/jenkins/PublishImages/Jenkinsfile index 1a568fb5933..e9b95b7660a 100644 --- a/ci/jenkins/PublishImages/Jenkinsfile +++ b/ci/jenkins/PublishImages/Jenkinsfile @@ -4,10 +4,6 @@ pipeline { } agent { kubernetes { - // cloud 'kubernetes' - // label 'jenkins-slave' - // defaultContainer 'jnlp' - // yamlFile 'ci/jenkins/pod/meta-builder.yaml' yaml ''' spec: securityContext: @@ -24,7 +20,7 @@ pipeline { stages { stage('Stage 1') { steps { - echo "branch: $env.BRANCH_NAME" + echo "branch: $env.BRANCH_NAME" echo 'Hello world!' } } From 72b99b17cb3ec1ea50e993319af50fa47374ec59 Mon Sep 17 00:00:00 2001 From: Liang Huang Date: Thu, 30 May 2024 17:51:40 +0800 Subject: [PATCH 04/33] . Signed-off-by: Liang Huang --- ci/jenkins/PublishImages/Jenkinsfile | 34 ++++++++++++++++++---------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/ci/jenkins/PublishImages/Jenkinsfile b/ci/jenkins/PublishImages/Jenkinsfile index e9b95b7660a..1815b3c9b62 100644 --- a/ci/jenkins/PublishImages/Jenkinsfile +++ b/ci/jenkins/PublishImages/Jenkinsfile @@ -38,20 +38,11 @@ pipeline { // sh 'kubectl get pod' // "ls -lah".execute().text.eachLine { line -> // echo line + // } + + def ret = tekton() - def ret = sh ( script: """ -cat << EOF | kubectl apply -f - -apiVersion: tekton.dev/v1beta1 -kind: TaskRun -metadata: - name: hello-task-run - namespace: milvus-ci -spec: - taskRef: - name: hello -EOF -""", returnStdout: true) def name = ret.split("/")[1].split(' ')[0] // def ret = sh(script: 'kubectl ', returnStdout: true) @@ -76,3 +67,22 @@ EOF } } } + +def tekton() string { + + def ret = sh ( script: """ + cat << EOF | kubectl apply -f - + apiVersion: tekton.dev/v1beta1 + kind: TaskRun + metadata: + name: hello-task-run + namespace: milvus-ci + spec: + taskRef: + name: hello + EOF + """, returnStdout: true) + + return ret + +} From 6a86126a4ff94d0df38737882d461020abc9d053 Mon Sep 17 00:00:00 2001 From: Liang Huang Date: Thu, 30 May 2024 17:52:51 +0800 Subject: [PATCH 05/33] . Signed-off-by: Liang Huang --- ci/jenkins/PublishImages/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkins/PublishImages/Jenkinsfile b/ci/jenkins/PublishImages/Jenkinsfile index 1815b3c9b62..3fbb6d07a93 100644 --- a/ci/jenkins/PublishImages/Jenkinsfile +++ b/ci/jenkins/PublishImages/Jenkinsfile @@ -68,7 +68,7 @@ pipeline { } } -def tekton() string { +def tekton() { def ret = sh ( script: """ cat << EOF | kubectl apply -f - From ea243f75064d32129a80dbc0962269bed4f9c772 Mon Sep 17 00:00:00 2001 From: Liang Huang Date: Thu, 30 May 2024 18:14:29 +0800 Subject: [PATCH 06/33] . Signed-off-by: Liang Huang --- ci/jenkins/PublishImages/Jenkinsfile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ci/jenkins/PublishImages/Jenkinsfile b/ci/jenkins/PublishImages/Jenkinsfile index 3fbb6d07a93..aa5503791f4 100644 --- a/ci/jenkins/PublishImages/Jenkinsfile +++ b/ci/jenkins/PublishImages/Jenkinsfile @@ -70,7 +70,8 @@ pipeline { def tekton() { - def ret = sh ( script: """ + def input = """ + cat << EOF | kubectl apply -f - apiVersion: tekton.dev/v1beta1 kind: TaskRun @@ -81,7 +82,12 @@ def tekton() { taskRef: name: hello EOF - """, returnStdout: true) + +""" + + sh "echo $input" + + def ret = sh ( script: input, returnStdout: true) return ret From 92cb889778776d3f438aa72346037589c22e935a Mon Sep 17 00:00:00 2001 From: Liang Huang Date: Thu, 30 May 2024 18:17:34 +0800 Subject: [PATCH 07/33] . Signed-off-by: Liang Huang --- ci/jenkins/PublishImages/Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/jenkins/PublishImages/Jenkinsfile b/ci/jenkins/PublishImages/Jenkinsfile index aa5503791f4..216f854cbe9 100644 --- a/ci/jenkins/PublishImages/Jenkinsfile +++ b/ci/jenkins/PublishImages/Jenkinsfile @@ -85,7 +85,8 @@ def tekton() { """ - sh "echo $input" + println input + // sh "echo $input" def ret = sh ( script: input, returnStdout: true) From b0b058f7b1e9c188a7630c773b2b196677b126d8 Mon Sep 17 00:00:00 2001 From: Liang Huang Date: Thu, 30 May 2024 18:19:51 +0800 Subject: [PATCH 08/33] . Signed-off-by: Liang Huang --- ci/jenkins/PublishImages/Jenkinsfile | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/ci/jenkins/PublishImages/Jenkinsfile b/ci/jenkins/PublishImages/Jenkinsfile index 216f854cbe9..89e224b861a 100644 --- a/ci/jenkins/PublishImages/Jenkinsfile +++ b/ci/jenkins/PublishImages/Jenkinsfile @@ -71,18 +71,16 @@ pipeline { def tekton() { def input = """ - - cat << EOF | kubectl apply -f - - apiVersion: tekton.dev/v1beta1 - kind: TaskRun - metadata: - name: hello-task-run - namespace: milvus-ci - spec: - taskRef: - name: hello - EOF - +cat << EOF | kubectl apply -f - +apiVersion: tekton.dev/v1beta1 +kind: TaskRun +metadata: + name: hello-task-run + namespace: milvus-ci +spec: + taskRef: + name: hello +EOF """ println input From 815d6390f56dfa5d569490a477709c7803a94c59 Mon Sep 17 00:00:00 2001 From: Liang Huang Date: Thu, 30 May 2024 18:21:17 +0800 Subject: [PATCH 09/33] . Signed-off-by: Liang Huang --- ci/jenkins/PublishImages/Jenkinsfile | 31 ++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/ci/jenkins/PublishImages/Jenkinsfile b/ci/jenkins/PublishImages/Jenkinsfile index 89e224b861a..f81063bf608 100644 --- a/ci/jenkins/PublishImages/Jenkinsfile +++ b/ci/jenkins/PublishImages/Jenkinsfile @@ -72,14 +72,33 @@ def tekton() { def input = """ cat << EOF | kubectl apply -f - -apiVersion: tekton.dev/v1beta1 -kind: TaskRun +apiVersion: tekton.dev/v1 +kind: PipelineRun metadata: - name: hello-task-run - namespace: milvus-ci + generateName: milbuild- spec: - taskRef: - name: hello + pipelineRef: + name: milvus-clone-build-push + taskRunTemplate: + serviceAccountName: robot-tekton + podTemplate: + # hostNetwork: true + securityContext: + fsGroup: 65532 + workspaces: + - name: shared-data + volumeClaimTemplate: + spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 100Gi + params: + - name: revision + value: master + - name: arch + value: amd64 EOF """ From 512cb75576276e9822663abb289492dbdb5259fd Mon Sep 17 00:00:00 2001 From: Liang Huang Date: Thu, 30 May 2024 18:22:23 +0800 Subject: [PATCH 10/33] . Signed-off-by: Liang Huang --- ci/jenkins/PublishImages/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkins/PublishImages/Jenkinsfile b/ci/jenkins/PublishImages/Jenkinsfile index f81063bf608..300895d1fe7 100644 --- a/ci/jenkins/PublishImages/Jenkinsfile +++ b/ci/jenkins/PublishImages/Jenkinsfile @@ -75,7 +75,7 @@ cat << EOF | kubectl apply -f - apiVersion: tekton.dev/v1 kind: PipelineRun metadata: - generateName: milbuild- + generateName: milvus-build- spec: pipelineRef: name: milvus-clone-build-push From 73583224e220cbb204c48abb93cf3c929c808c09 Mon Sep 17 00:00:00 2001 From: Liang Huang Date: Thu, 30 May 2024 18:22:40 +0800 Subject: [PATCH 11/33] . Signed-off-by: Liang Huang --- ci/jenkins/PublishImages/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkins/PublishImages/Jenkinsfile b/ci/jenkins/PublishImages/Jenkinsfile index 300895d1fe7..dfba5b8969e 100644 --- a/ci/jenkins/PublishImages/Jenkinsfile +++ b/ci/jenkins/PublishImages/Jenkinsfile @@ -71,7 +71,7 @@ pipeline { def tekton() { def input = """ -cat << EOF | kubectl apply -f - +cat << EOF | kubectl create -f - apiVersion: tekton.dev/v1 kind: PipelineRun metadata: From 5e159fb0303350c881b6fd77e009068f7e780c23 Mon Sep 17 00:00:00 2001 From: Liang Huang Date: Thu, 30 May 2024 18:25:08 +0800 Subject: [PATCH 12/33] . Signed-off-by: Liang Huang --- ci/jenkins/PublishImages/Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/jenkins/PublishImages/Jenkinsfile b/ci/jenkins/PublishImages/Jenkinsfile index dfba5b8969e..ebf77ac85e2 100644 --- a/ci/jenkins/PublishImages/Jenkinsfile +++ b/ci/jenkins/PublishImages/Jenkinsfile @@ -76,6 +76,7 @@ apiVersion: tekton.dev/v1 kind: PipelineRun metadata: generateName: milvus-build- + namespace: milvus-ci spec: pipelineRef: name: milvus-clone-build-push From c28d9436822e1761ed0d6564bd3db72931631654 Mon Sep 17 00:00:00 2001 From: Liang Huang Date: Thu, 30 May 2024 18:53:19 +0800 Subject: [PATCH 13/33] . Signed-off-by: Liang Huang --- ci/jenkins/PublishImages/Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/jenkins/PublishImages/Jenkinsfile b/ci/jenkins/PublishImages/Jenkinsfile index ebf77ac85e2..a41843b5f2c 100644 --- a/ci/jenkins/PublishImages/Jenkinsfile +++ b/ci/jenkins/PublishImages/Jenkinsfile @@ -41,7 +41,7 @@ pipeline { // } - def ret = tekton() +def ret = tekton( ["revision": 'main', "arch":'amd64']) def name = ret.split("/")[1].split(' ')[0] // def ret = sh(script: 'kubectl ', returnStdout: true) @@ -68,7 +68,7 @@ pipeline { } } -def tekton() { +def tekton(ars) { def input = """ cat << EOF | kubectl create -f - @@ -97,9 +97,9 @@ spec: storage: 100Gi params: - name: revision - value: master + value: ${args.revision} - name: arch - value: amd64 + value: ${args.arch} EOF """ From 596d491ec209d842ac58a116e4c920a374baccad Mon Sep 17 00:00:00 2001 From: Liang Huang Date: Thu, 30 May 2024 18:54:37 +0800 Subject: [PATCH 14/33] . Signed-off-by: Liang Huang --- ci/jenkins/PublishImages/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkins/PublishImages/Jenkinsfile b/ci/jenkins/PublishImages/Jenkinsfile index a41843b5f2c..62b0c4e6983 100644 --- a/ci/jenkins/PublishImages/Jenkinsfile +++ b/ci/jenkins/PublishImages/Jenkinsfile @@ -47,7 +47,7 @@ def ret = tekton( ["revision": 'main', "arch":'amd64']) // def ret = sh(script: 'kubectl ', returnStdout: true) sh """ - kubectl logs ${name}-pod -f -n milvus-ci + kubectl logs -n milvus-ci -l tekton.dev/pipelineRun=${name} -f --max-log-requests=10 """ sh """ From d6a4797ab1826f86a7882f3ef52ac7e61df18d01 Mon Sep 17 00:00:00 2001 From: Liang Huang Date: Thu, 30 May 2024 18:57:50 +0800 Subject: [PATCH 15/33] . Signed-off-by: Liang Huang --- ci/jenkins/PublishImages/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkins/PublishImages/Jenkinsfile b/ci/jenkins/PublishImages/Jenkinsfile index 62b0c4e6983..148360d8103 100644 --- a/ci/jenkins/PublishImages/Jenkinsfile +++ b/ci/jenkins/PublishImages/Jenkinsfile @@ -68,7 +68,7 @@ def ret = tekton( ["revision": 'main', "arch":'amd64']) } } -def tekton(ars) { +def tekton(Map ars) { def input = """ cat << EOF | kubectl create -f - From 528811e16e9de4742b9bdca3b5d726c8a17ee4bf Mon Sep 17 00:00:00 2001 From: Liang Huang Date: Thu, 30 May 2024 18:58:08 +0800 Subject: [PATCH 16/33] . Signed-off-by: Liang Huang --- ci/jenkins/PublishImages/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkins/PublishImages/Jenkinsfile b/ci/jenkins/PublishImages/Jenkinsfile index 148360d8103..61b76f4b156 100644 --- a/ci/jenkins/PublishImages/Jenkinsfile +++ b/ci/jenkins/PublishImages/Jenkinsfile @@ -68,7 +68,7 @@ def ret = tekton( ["revision": 'main', "arch":'amd64']) } } -def tekton(Map ars) { +def tekton(Map args) { def input = """ cat << EOF | kubectl create -f - From 23113c21641c1478ca726bab3e3d84230287a222 Mon Sep 17 00:00:00 2001 From: Liang Huang Date: Thu, 30 May 2024 19:00:43 +0800 Subject: [PATCH 17/33] . Signed-off-by: Liang Huang --- ci/jenkins/PublishImages/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkins/PublishImages/Jenkinsfile b/ci/jenkins/PublishImages/Jenkinsfile index 61b76f4b156..7813b677672 100644 --- a/ci/jenkins/PublishImages/Jenkinsfile +++ b/ci/jenkins/PublishImages/Jenkinsfile @@ -41,7 +41,7 @@ pipeline { // } -def ret = tekton( ["revision": 'main', "arch":'amd64']) +def ret = tekton( ["revision": 'master', "arch":'amd64']) def name = ret.split("/")[1].split(' ')[0] // def ret = sh(script: 'kubectl ', returnStdout: true) From 2e489268b681b5c95de30fc3c4a5d1ffe5444b73 Mon Sep 17 00:00:00 2001 From: Liang Huang Date: Thu, 30 May 2024 19:05:46 +0800 Subject: [PATCH 18/33] . Signed-off-by: Liang Huang --- ci/jenkins/PublishImages/Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/jenkins/PublishImages/Jenkinsfile b/ci/jenkins/PublishImages/Jenkinsfile index 7813b677672..89ba9867938 100644 --- a/ci/jenkins/PublishImages/Jenkinsfile +++ b/ci/jenkins/PublishImages/Jenkinsfile @@ -47,11 +47,12 @@ def ret = tekton( ["revision": 'master', "arch":'amd64']) // def ret = sh(script: 'kubectl ', returnStdout: true) sh """ + sleep 3 kubectl logs -n milvus-ci -l tekton.dev/pipelineRun=${name} -f --max-log-requests=10 """ sh """ - kubectl describe taskrun ${name} -n milvus-ci + kubectl describe tekton.dev/pipelineRun ${name} -n milvus-ci """ // "kubectl get pod".execute().text.eachLine { line -> From 541de41a1bf040e685dfa89efb10300df2cc295a Mon Sep 17 00:00:00 2001 From: Liang Huang Date: Thu, 30 May 2024 19:09:20 +0800 Subject: [PATCH 19/33] . Signed-off-by: Liang Huang --- ci/jenkins/PublishImages/Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci/jenkins/PublishImages/Jenkinsfile b/ci/jenkins/PublishImages/Jenkinsfile index 89ba9867938..33e35d21276 100644 --- a/ci/jenkins/PublishImages/Jenkinsfile +++ b/ci/jenkins/PublishImages/Jenkinsfile @@ -47,8 +47,7 @@ def ret = tekton( ["revision": 'master', "arch":'amd64']) // def ret = sh(script: 'kubectl ', returnStdout: true) sh """ - sleep 3 - kubectl logs -n milvus-ci -l tekton.dev/pipelineRun=${name} -f --max-log-requests=10 + kubectl logs -n milvus-ci -l tekton.dev/pipelineRun=${name} -f --max-log-requests=10 --ignore-errors=true """ sh """ From 2c0527790584e51dac7f59974f665798a14a73c1 Mon Sep 17 00:00:00 2001 From: Liang Huang Date: Thu, 30 May 2024 19:19:24 +0800 Subject: [PATCH 20/33] . Signed-off-by: Liang Huang --- ci/jenkins/PublishImages/Jenkinsfile | 33 +++++++++++++++------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/ci/jenkins/PublishImages/Jenkinsfile b/ci/jenkins/PublishImages/Jenkinsfile index 33e35d21276..cdc5fd62a28 100644 --- a/ci/jenkins/PublishImages/Jenkinsfile +++ b/ci/jenkins/PublishImages/Jenkinsfile @@ -1,7 +1,7 @@ pipeline { options { skipDefaultCheckout true - } + } agent { kubernetes { yaml ''' @@ -40,27 +40,30 @@ pipeline { // echo line // } - + def ret = tekton( ["revision": 'master', "arch":'amd64']) def name = ret.split("/")[1].split(' ')[0] // def ret = sh(script: 'kubectl ', returnStdout: true) - - sh """ - kubectl logs -n milvus-ci -l tekton.dev/pipelineRun=${name} -f --max-log-requests=10 --ignore-errors=true - """ - + + def status= sh script: "kubectl get pipelineRun milvus-build-p9p2l -n milvus-ci | tail -1 | awk '{print \$3}'", returnStdout: true) + while (status == "Running") { + sleep 3 + sh """ + kubectl logs -n milvus-ci -l tekton.dev/pipelineRun=${name} -f --max-log-requests=10 --ignore-errors=true + """ + } sh """ kubectl describe tekton.dev/pipelineRun ${name} -n milvus-ci """ - // "kubectl get pod".execute().text.eachLine { line -> - // echo line - // } - // "tkn task start hello".execute().text.eachLine { line -> - // echo line - // } - // sh 'echo hello' + // "kubectl get pod".execute().text.eachLine { line -> + // echo line + // } + // "tkn task start hello".execute().text.eachLine { line -> + // echo line + // } + // sh 'echo hello' } } } @@ -102,7 +105,7 @@ spec: value: ${args.arch} EOF """ - + println input // sh "echo $input" From be20ae4a2bee5a1f5606a6c647eb04f06bfc6cd5 Mon Sep 17 00:00:00 2001 From: Liang Huang Date: Thu, 30 May 2024 19:19:45 +0800 Subject: [PATCH 21/33] . Signed-off-by: Liang Huang --- ci/jenkins/PublishImages/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkins/PublishImages/Jenkinsfile b/ci/jenkins/PublishImages/Jenkinsfile index cdc5fd62a28..d0d93efc0fc 100644 --- a/ci/jenkins/PublishImages/Jenkinsfile +++ b/ci/jenkins/PublishImages/Jenkinsfile @@ -46,7 +46,7 @@ def ret = tekton( ["revision": 'master', "arch":'amd64']) def name = ret.split("/")[1].split(' ')[0] // def ret = sh(script: 'kubectl ', returnStdout: true) - def status= sh script: "kubectl get pipelineRun milvus-build-p9p2l -n milvus-ci | tail -1 | awk '{print \$3}'", returnStdout: true) + def status= sh script: "kubectl get pipelineRun ${name} -n milvus-ci | tail -1 | awk '{print \$3}'", returnStdout: true) while (status == "Running") { sleep 3 sh """ From 8e270ec6f84b1651212a5937b06908704280f06f Mon Sep 17 00:00:00 2001 From: Liang Huang Date: Thu, 30 May 2024 19:20:04 +0800 Subject: [PATCH 22/33] . Signed-off-by: Liang Huang --- ci/jenkins/PublishImages/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkins/PublishImages/Jenkinsfile b/ci/jenkins/PublishImages/Jenkinsfile index d0d93efc0fc..1dc20d54f90 100644 --- a/ci/jenkins/PublishImages/Jenkinsfile +++ b/ci/jenkins/PublishImages/Jenkinsfile @@ -46,7 +46,7 @@ def ret = tekton( ["revision": 'master', "arch":'amd64']) def name = ret.split("/")[1].split(' ')[0] // def ret = sh(script: 'kubectl ', returnStdout: true) - def status= sh script: "kubectl get pipelineRun ${name} -n milvus-ci | tail -1 | awk '{print \$3}'", returnStdout: true) + def status= sh script: "kubectl get pipelineRun ${name} -n milvus-ci | tail -1 | awk '{print \$3}'", returnStdout: true while (status == "Running") { sleep 3 sh """ From 0eed45aa60f2f2290186b45a7e3c663e43814b9b Mon Sep 17 00:00:00 2001 From: Liang Huang Date: Thu, 30 May 2024 19:22:10 +0800 Subject: [PATCH 23/33] . Signed-off-by: Liang Huang --- ci/jenkins/PublishImages/Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/jenkins/PublishImages/Jenkinsfile b/ci/jenkins/PublishImages/Jenkinsfile index 1dc20d54f90..1bd651f0144 100644 --- a/ci/jenkins/PublishImages/Jenkinsfile +++ b/ci/jenkins/PublishImages/Jenkinsfile @@ -47,6 +47,7 @@ def ret = tekton( ["revision": 'master', "arch":'amd64']) // def ret = sh(script: 'kubectl ', returnStdout: true) def status= sh script: "kubectl get pipelineRun ${name} -n milvus-ci | tail -1 | awk '{print \$3}'", returnStdout: true + echo "status: ${status}" while (status == "Running") { sleep 3 sh """ @@ -54,7 +55,7 @@ def ret = tekton( ["revision": 'master', "arch":'amd64']) """ } sh """ - kubectl describe tekton.dev/pipelineRun ${name} -n milvus-ci + kubectl describe pipelineRun ${name} -n milvus-ci """ // "kubectl get pod".execute().text.eachLine { line -> From d557f25d4d80c461ab53f87958c9b8d3f51560a1 Mon Sep 17 00:00:00 2001 From: Liang Huang Date: Thu, 30 May 2024 19:22:21 +0800 Subject: [PATCH 24/33] . Signed-off-by: Liang Huang --- ci/jenkins/PublishImages/Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/jenkins/PublishImages/Jenkinsfile b/ci/jenkins/PublishImages/Jenkinsfile index 1bd651f0144..21db10d7f07 100644 --- a/ci/jenkins/PublishImages/Jenkinsfile +++ b/ci/jenkins/PublishImages/Jenkinsfile @@ -47,6 +47,7 @@ def ret = tekton( ["revision": 'master', "arch":'amd64']) // def ret = sh(script: 'kubectl ', returnStdout: true) def status= sh script: "kubectl get pipelineRun ${name} -n milvus-ci | tail -1 | awk '{print \$3}'", returnStdout: true + sleep 3 echo "status: ${status}" while (status == "Running") { sleep 3 From d5b951c14c1bd6436be111047ca51063177629e8 Mon Sep 17 00:00:00 2001 From: Liang Huang Date: Thu, 30 May 2024 19:24:05 +0800 Subject: [PATCH 25/33] . Signed-off-by: Liang Huang --- ci/jenkins/PublishImages/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkins/PublishImages/Jenkinsfile b/ci/jenkins/PublishImages/Jenkinsfile index 21db10d7f07..53e45ade54f 100644 --- a/ci/jenkins/PublishImages/Jenkinsfile +++ b/ci/jenkins/PublishImages/Jenkinsfile @@ -49,7 +49,7 @@ def ret = tekton( ["revision": 'master', "arch":'amd64']) def status= sh script: "kubectl get pipelineRun ${name} -n milvus-ci | tail -1 | awk '{print \$3}'", returnStdout: true sleep 3 echo "status: ${status}" - while (status == "Running") { + while ("Running".equalsIgnoreCase(status)) { sleep 3 sh """ kubectl logs -n milvus-ci -l tekton.dev/pipelineRun=${name} -f --max-log-requests=10 --ignore-errors=true From a46f00d0be18bc8000b64afe6b9d2aeff2338af6 Mon Sep 17 00:00:00 2001 From: Liang Huang Date: Thu, 30 May 2024 19:32:52 +0800 Subject: [PATCH 26/33] . Signed-off-by: Liang Huang --- ci/jenkins/PublishImages/Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/jenkins/PublishImages/Jenkinsfile b/ci/jenkins/PublishImages/Jenkinsfile index 53e45ade54f..f3a18529d01 100644 --- a/ci/jenkins/PublishImages/Jenkinsfile +++ b/ci/jenkins/PublishImages/Jenkinsfile @@ -50,11 +50,13 @@ def ret = tekton( ["revision": 'master', "arch":'amd64']) sleep 3 echo "status: ${status}" while ("Running".equalsIgnoreCase(status)) { - sleep 3 sh """ kubectl logs -n milvus-ci -l tekton.dev/pipelineRun=${name} -f --max-log-requests=10 --ignore-errors=true """ + status= sh script: "kubectl get pipelineRun ${name} -n milvus-ci | tail -1 | awk '{print \$3}'", returnStdout: true + echo "status: ${status}" } + sh """ kubectl describe pipelineRun ${name} -n milvus-ci """ From 067126843b891d057b1aef02aeef5743eb5677dc Mon Sep 17 00:00:00 2001 From: Liang Huang Date: Thu, 30 May 2024 19:34:41 +0800 Subject: [PATCH 27/33] . Signed-off-by: Liang Huang --- ci/jenkins/PublishImages/Jenkinsfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ci/jenkins/PublishImages/Jenkinsfile b/ci/jenkins/PublishImages/Jenkinsfile index f3a18529d01..f02d7f0f231 100644 --- a/ci/jenkins/PublishImages/Jenkinsfile +++ b/ci/jenkins/PublishImages/Jenkinsfile @@ -50,12 +50,13 @@ def ret = tekton( ["revision": 'master', "arch":'amd64']) sleep 3 echo "status: ${status}" while ("Running".equalsIgnoreCase(status)) { - sh """ - kubectl logs -n milvus-ci -l tekton.dev/pipelineRun=${name} -f --max-log-requests=10 --ignore-errors=true - """ + // sh """ + // kubectl logs -n milvus-ci -l tekton.dev/pipelineRun=${name} -f --max-log-requests=10 --ignore-errors=true + // """ status= sh script: "kubectl get pipelineRun ${name} -n milvus-ci | tail -1 | awk '{print \$3}'", returnStdout: true echo "status: ${status}" } + echo "endd status: ${status}" sh """ kubectl describe pipelineRun ${name} -n milvus-ci From 7874e59929a4524e350b55bd756e56ff1625afc2 Mon Sep 17 00:00:00 2001 From: Liang Huang Date: Thu, 30 May 2024 19:38:33 +0800 Subject: [PATCH 28/33] . Signed-off-by: Liang Huang --- ci/jenkins/PublishImages/Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/jenkins/PublishImages/Jenkinsfile b/ci/jenkins/PublishImages/Jenkinsfile index f02d7f0f231..5a24cfe0fc4 100644 --- a/ci/jenkins/PublishImages/Jenkinsfile +++ b/ci/jenkins/PublishImages/Jenkinsfile @@ -49,7 +49,8 @@ def ret = tekton( ["revision": 'master', "arch":'amd64']) def status= sh script: "kubectl get pipelineRun ${name} -n milvus-ci | tail -1 | awk '{print \$3}'", returnStdout: true sleep 3 echo "status: ${status}" - while ("Running".equalsIgnoreCase(status)) { + while (status.contains("Running")) { + echo "in while" // sh """ // kubectl logs -n milvus-ci -l tekton.dev/pipelineRun=${name} -f --max-log-requests=10 --ignore-errors=true // """ From 00ab33a3e568aac22c6886d52a1fe1df8e96ee91 Mon Sep 17 00:00:00 2001 From: Liang Huang Date: Thu, 30 May 2024 19:42:53 +0800 Subject: [PATCH 29/33] . Signed-off-by: Liang Huang --- ci/jenkins/PublishImages/Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/jenkins/PublishImages/Jenkinsfile b/ci/jenkins/PublishImages/Jenkinsfile index 5a24cfe0fc4..2bbf0959f75 100644 --- a/ci/jenkins/PublishImages/Jenkinsfile +++ b/ci/jenkins/PublishImages/Jenkinsfile @@ -51,9 +51,9 @@ def ret = tekton( ["revision": 'master', "arch":'amd64']) echo "status: ${status}" while (status.contains("Running")) { echo "in while" - // sh """ - // kubectl logs -n milvus-ci -l tekton.dev/pipelineRun=${name} -f --max-log-requests=10 --ignore-errors=true - // """ + sh """ + kubectl logs -n milvus-ci -l tekton.dev/pipelineRun=${name} -f --max-log-requests=10 --ignore-errors=true + """ status= sh script: "kubectl get pipelineRun ${name} -n milvus-ci | tail -1 | awk '{print \$3}'", returnStdout: true echo "status: ${status}" } From 065b34a6100dbc54b676c2bae260638d4eb84fe6 Mon Sep 17 00:00:00 2001 From: Liang Huang Date: Fri, 31 May 2024 10:22:31 +0800 Subject: [PATCH 30/33] . Signed-off-by: Liang Huang --- ci/jenkins/PublishImages/Jenkinsfile | 68 +++++++++++++++++----------- 1 file changed, 42 insertions(+), 26 deletions(-) diff --git a/ci/jenkins/PublishImages/Jenkinsfile b/ci/jenkins/PublishImages/Jenkinsfile index 2bbf0959f75..1f9ef0d3791 100644 --- a/ci/jenkins/PublishImages/Jenkinsfile +++ b/ci/jenkins/PublishImages/Jenkinsfile @@ -14,6 +14,11 @@ pipeline { command: - cat tty: true + - name: tkn + image: huangliang1203/tkn:latest + command: + - cat + tty: true ''' } } @@ -24,16 +29,10 @@ pipeline { echo 'Hello world!' } } - stage('sleep') { - steps { - script { - sleep 1 - } - } - } - stage('list pod') { + stage('build') { steps { container('kubectl') { + def name = "" script { // sh 'kubectl get pod' // "ls -lah".execute().text.eachLine { line -> @@ -41,27 +40,27 @@ pipeline { // } -def ret = tekton( ["revision": 'master', "arch":'amd64']) + def ret = tekton( ["revision": 'master', "arch":'amd64']) - def name = ret.split("/")[1].split(' ')[0] + name = ret.split("/")[1].split(' ')[0] // def ret = sh(script: 'kubectl ', returnStdout: true) - def status= sh script: "kubectl get pipelineRun ${name} -n milvus-ci | tail -1 | awk '{print \$3}'", returnStdout: true - sleep 3 - echo "status: ${status}" - while (status.contains("Running")) { - echo "in while" - sh """ - kubectl logs -n milvus-ci -l tekton.dev/pipelineRun=${name} -f --max-log-requests=10 --ignore-errors=true - """ - status= sh script: "kubectl get pipelineRun ${name} -n milvus-ci | tail -1 | awk '{print \$3}'", returnStdout: true - echo "status: ${status}" - } - echo "endd status: ${status}" - - sh """ - kubectl describe pipelineRun ${name} -n milvus-ci - """ + // def status= sh script: "kubectl get pipelineRun ${name} -n milvus-ci | tail -1 | awk '{print \$3}'", returnStdout: true + // sleep 3 + // echo "status: ${status}" + // while (status.contains("Running")) { + // echo "in while" + // sh """ + // kubectl logs -n milvus-ci -l tekton.dev/pipelineRun=${name} -f --max-log-requests=10 --ignore-errors=true + // """ + // status= sh script: "kubectl get pipelineRun ${name} -n milvus-ci | tail -1 | awk '{print \$3}'", returnStdout: true + // echo "status: ${status}" + // } + // echo "endd status: ${status}" + // + // sh """ + // kubectl describe pipelineRun ${name} -n milvus-ci + // """ // "kubectl get pod".execute().text.eachLine { line -> // echo line @@ -72,6 +71,23 @@ def ret = tekton( ["revision": 'master', "arch":'amd64']) // sh 'echo hello' } } + + container('tkn') { + script { + + sh """ + tkn pipelinerun logs ${name} -f -n milvus-ci + """ + + sh """ + tkn pipelinerun describe ${name} -f -n milvus-ci + """ + // sh 'tkn task start hello' + // "tkn task start hello".execute().text.eachLine { line -> + // echo line + // } + } + } } } } From 0329647649752cb447d186d8dacba75d669b5a2f Mon Sep 17 00:00:00 2001 From: Liang Huang Date: Fri, 31 May 2024 10:23:52 +0800 Subject: [PATCH 31/33] . Signed-off-by: Liang Huang --- ci/jenkins/PublishImages/Jenkinsfile | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/ci/jenkins/PublishImages/Jenkinsfile b/ci/jenkins/PublishImages/Jenkinsfile index 1f9ef0d3791..aa91ee9220a 100644 --- a/ci/jenkins/PublishImages/Jenkinsfile +++ b/ci/jenkins/PublishImages/Jenkinsfile @@ -1,6 +1,8 @@ +def name = '' + pipeline { options { - skipDefaultCheckout true + skipDefaultCheckout true } agent { kubernetes { @@ -32,7 +34,6 @@ pipeline { stage('build') { steps { container('kubectl') { - def name = "" script { // sh 'kubectl get pod' // "ls -lah".execute().text.eachLine { line -> @@ -40,9 +41,9 @@ pipeline { // } - def ret = tekton( ["revision": 'master', "arch":'amd64']) + def ret = tekton(['revision': 'master', 'arch':'amd64']) - name = ret.split("/")[1].split(' ')[0] + name = ret.split('/')[1].split(' ')[0] // def ret = sh(script: 'kubectl ', returnStdout: true) // def status= sh script: "kubectl get pipelineRun ${name} -n milvus-ci | tail -1 | awk '{print \$3}'", returnStdout: true @@ -71,10 +72,9 @@ pipeline { // sh 'echo hello' } } - + container('tkn') { script { - sh """ tkn pipelinerun logs ${name} -f -n milvus-ci """ @@ -82,10 +82,10 @@ pipeline { sh """ tkn pipelinerun describe ${name} -f -n milvus-ci """ - // sh 'tkn task start hello' - // "tkn task start hello".execute().text.eachLine { line -> - // echo line - // } + // sh 'tkn task start hello' + // "tkn task start hello".execute().text.eachLine { line -> + // echo line + // } } } } @@ -94,8 +94,7 @@ pipeline { } def tekton(Map args) { - - def input = """ + def input = """ cat << EOF | kubectl create -f - apiVersion: tekton.dev/v1 kind: PipelineRun @@ -128,11 +127,10 @@ spec: EOF """ - println input + println input // sh "echo $input" - def ret = sh ( script: input, returnStdout: true) + def ret = sh( script: input, returnStdout: true) return ret - } From a1fbe93da6689e2376bc9eb8c63709e53321691b Mon Sep 17 00:00:00 2001 From: Liang Huang Date: Fri, 31 May 2024 10:29:57 +0800 Subject: [PATCH 32/33] . Signed-off-by: Liang Huang --- ci/jenkins/PublishImages/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkins/PublishImages/Jenkinsfile b/ci/jenkins/PublishImages/Jenkinsfile index aa91ee9220a..10aabd1a852 100644 --- a/ci/jenkins/PublishImages/Jenkinsfile +++ b/ci/jenkins/PublishImages/Jenkinsfile @@ -41,7 +41,7 @@ pipeline { // } - def ret = tekton(['revision': 'master', 'arch':'amd64']) + def ret = tekton 'revision': "$env.BRANCH_NAME", 'arch':'amd64' name = ret.split('/')[1].split(' ')[0] // def ret = sh(script: 'kubectl ', returnStdout: true) From f0f4b84640246ee8ecab8ee9c5b6032aaa3103cd Mon Sep 17 00:00:00 2001 From: Liang Huang Date: Fri, 31 May 2024 10:34:23 +0800 Subject: [PATCH 33/33] . Signed-off-by: Liang Huang --- ci/jenkins/PublishImages/Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/jenkins/PublishImages/Jenkinsfile b/ci/jenkins/PublishImages/Jenkinsfile index 10aabd1a852..5151fc257f1 100644 --- a/ci/jenkins/PublishImages/Jenkinsfile +++ b/ci/jenkins/PublishImages/Jenkinsfile @@ -41,6 +41,7 @@ pipeline { // } + def ret = tekton 'revision': "$env.BRANCH_NAME", 'arch':'amd64' name = ret.split('/')[1].split(' ')[0]