fix(apps/prod/tekton/configs): fix pipeline and templates for custom …

…builder image support (#1315) Signed-off-by: wuhuizuo <[email protected]> Signed-off-by: wuhuizuo <[email protected]>
PingCAP-QE · Nov 6, 2024 · 5dee7ea · 5dee7ea
1 parent 81a91ad
commit 5dee7ea
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/apps/prod/tekton/configs/pipelines/pingcap-build-package-darwin.yaml b/apps/prod/tekton/configs/pipelines/pingcap-build-package-darwin.yaml
@@ -37,6 +37,12 @@ spec:
     - name: registry
       description: the base OCI registry server for store artifacts, it can be set with prefix repo path.
       default: "hub.pingcap.net"
+    - name: force-builder-image
+      description: >
+        The builder image to use for building binaries by force, if empty.
+        Default the task will complete one from config in artifacts.git repo.
+      type: string
+      default: ""      
   results:
     - name: pushed-binaries
       description: pushed binaries.
@@ -112,6 +118,8 @@ spec:
           value: "$(params.profile)"
         - name: version
           value: "$(tasks.get-release-ver.results.version)"
+        - name: force-builder-image
+          value: "$(params.force-builder-image)"          
     - name: acquire-mac-machine
       runAfter:
         - checkout

diff --git a/apps/prod/tekton/configs/triggers/templates/_/build-component-all-platforms.yaml b/apps/prod/tekton/configs/triggers/templates/_/build-component-all-platforms.yaml
@@ -32,6 +32,8 @@ spec:
     - name: ce-context
       description: cloud event context.
       default: '{}'
+    - name: force-builder-image
+      default: ''
   resourcetemplates:
     - apiVersion: tekton.dev/v1beta1
       kind: PipelineRun
@@ -67,6 +69,8 @@ spec:
             value: amd64
           - name: registry
             value: $(tt.params.registry)
+          - name: force-builder-image
+            value: $(tt.params.force-builder-image)
         taskRunSpecs:
           - pipelineTaskName: build-binaries
             taskPodTemplate:
@@ -140,6 +144,8 @@ spec:
             value: arm64
           - name: registry
             value: $(tt.params.registry)
+          - name: force-builder-image
+            value: $(tt.params.force-builder-image)            
         taskRunSpecs:
           - pipelineTaskName: build-binaries
             taskPodTemplate:
@@ -211,6 +217,8 @@ spec:
             value: amd64
           - name: registry
             value: $(tt.params.registry)
+          - name: force-builder-image
+            value: $(tt.params.force-builder-image)            
         taskRunSpecs:
           - pipelineTaskName: acquire-mac-machine
             taskPodTemplate:
@@ -274,6 +282,8 @@ spec:
             value: arm64
           - name: registry
             value: $(tt.params.registry)
+          - name: force-builder-image
+            value: $(tt.params.force-builder-image)            
         taskRunSpecs:
           - pipelineTaskName: acquire-mac-machine
             taskPodTemplate: