fix(apps/prod/tekton/configs/triggers): fix trigger for ctl building (

#966) CEL do not support index with `-1` like golang. Signed-off-by: wuhuizuo <wuhuizuo@126.com>
PingCAP-QE · Feb 21, 2024 · e0d17d9 · e0d17d9
1 parent b32db9b
commit e0d17d9
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/apps/prod/tekton/configs/triggers/triggers/_/ctl/artifact-push-on-harbor.yaml b/apps/prod/tekton/configs/triggers/triggers/_/ctl/artifact-push-on-harbor.yaml
@@ -17,14 +17,14 @@ spec:
             body.event_data.resources[0].tag.matches('^(master|main)(-[0-9a-f]{7,10})_(darwin|linux)_(amd64|arm64)$')
         - name: overlays
           value:
-          - key: arch
-            expression: body.event_data.resources[0].tag.split('_')[-1]
-          - key: os
-            expression: body.event_data.resources[0].tag.split('_')[-2]
           - key: git-ref
-            expression: body.event_data.resources[0].tag.split('_')[-3].spint('-')[:-1].join('_')
+            expression: body.event_data.resources[0].tag.split('_')[0].split('-')[0]
           - key: git-revision
-            expression: body.event_data.resources[0].tag.split('_')[-3].spint('-')[-1]
+            expression: body.event_data.resources[0].tag.split('_')[0].split('-')[1]
+          - key: os
+            expression: body.event_data.resources[0].tag.split('_')[1]
+          - key: arch
+            expression: body.event_data.resources[0].tag.split('_')[2]
   bindings:
     - { name: component, value: ctl }
     - { name: profile, value: release }
@@ -55,14 +55,14 @@ spec:
             body.event_data.resources[0].tag.matches('^release-[0-9]+[.][0-9]+(-[0-9a-f]{7,10})-.*_(linux|darwin)_(amd64|arm64)$')
         - name: overlays
           value:
-          - key: arch
-            expression: body.event_data.resources[0].tag.split('_')[-1]
-          - key: os
-            expression: body.event_data.resources[0].tag.split('_')[-2]
           - key: git-ref
-            expression: body.event_data.resources[0].tag.split('_')[-3].spint('-')[:-1].join('_')
+            expression: body.event_data.resources[0].tag.split('_')[0].split('-')[0:1].join('-')
           - key: git-revision
-            expression: body.event_data.resources[0].tag.split('_')[-3].spint('-')[-1]
+            expression: body.event_data.resources[0].tag.split('_')[0].split('-')[2]
+          - key: os
+            expression: body.event_data.resources[0].tag.split('_')[1]
+          - key: arch
+            expression: body.event_data.resources[0].tag.split('_')[2]
   bindings:
     - { name: component, value: ctl }
     - { name: profile, value: release }
@@ -93,14 +93,14 @@ spec:
             body.event_data.resources[0].tag.matches('^v[0-9]+[.][0-9]+[.][0-9]+(-[0-9a-f]{7,10})_(linux|darwin)_(amd64|arm64)$')
         - name: overlays
           value:
-          - key: arch
-            expression: body.event_data.resources[0].tag.split('_')[-1]
-          - key: os
-            expression: body.event_data.resources[0].tag.split('_')[-2]
           - key: git-ref
-            expression: body.event_data.resources[0].tag.split('_')[-3]
+            expression: body.event_data.resources[0].tag.split('_')[0]
           - key: git-revision
-            expression: body.event_data.resources[0].tag.split('_')[-3]
+            expression: body.event_data.resources[0].tag.split('_')[0]
+          - key: os
+            expression: body.event_data.resources[0].tag.split('_')[1]
+          - key: arch
+            expression: body.event_data.resources[0].tag.split('_')[2]
   bindings:
     - { name: component, value: ctl }
     - { name: profile, value: release }

diff --git a/apps/prod/tekton/configs/triggers/triggers/_/ctl/harbor.http b/apps/prod/tekton/configs/triggers/triggers/_/ctl/harbor.http
@@ -11,9 +11,9 @@ Content-Type: application/json
     "event_data": {
         "resources": [
             {
-                "digest": "sha256:6efdf19e78f53389153a1b7351168ee81a15ca2aa25a157fd47a714b5dcf14e4",
-                "tag": "master-1fc92b3_linux_amd64",
-                "resource_url": "hub.pingcap.net/pingcap/tidb/package:master-1fc92b3_linux_amd64"
+                "digest": "sha256:135e16fc9db29cba5c6bb59a837af7da53c25332d3213d534cab4afa9122a9d7",
+                "tag": "master-38abd86_linux_amd64",
+                "resource_url": "hub.pingcap.net/pingcap/tidb/package:master-38abd86_linux_amd64"
             }
         ],
         "repository": {