Fix tekton pipelines.

2026-07-10 23:22:55 -04:00
parent 3cdde05975
commit c6e1b28c07
2 changed files with 129 additions and 26 deletions
--- a/.webhook_bridge/pipeline-build-hash.yaml
+++ b/.webhook_bridge/pipeline-build-hash.yaml
@@ -50,18 +50,6 @@ spec:
          - name: TARGET_URL
            value: "https://tekton.fizz.buzz/#/namespaces/$(context.pipelineRun.namespace)/pipelineruns/$(context.pipelineRun.name)"
      - name: fetch-repository
-        taskRef:
-          resolver: git
-          params:
-            - name: url
-              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
-            - name: revision
-              value: df36b3853a5657fd883015cdbf07ad6466918acf
-            - name: pathInRepo
-              value: task/git-clone/0.9/git-clone.yaml
-        workspaces:
-          - name: output
-            workspace: git-source
        params:
          - name: url
            value: $(params.REPO_URL)
@@ -69,6 +57,18 @@ spec:
            value: $(params.PULL_BASE_SHA)
          - name: deleteExisting
            value: "true"
+        taskRef:
+          params:
+            - name: url
+              value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
+            - name: revision
+              value: "31376f29c6332ea8c378152d5ccda1ba9dbcd7bb"
+            - name: pathInRepo
+              value: task/git-clone/0.1/git-clone.yaml
+          resolver: git
+        workspaces:
+          - name: output
+            workspace: git-source
      - name: get-git-commit-time
        taskSpec:
          metadata: {}
@@ -101,7 +101,7 @@ spec:
            - name: url
              value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
            - name: revision
-              value: 7ee31a185243ee6da13dcd26a592c585b64c80e5
+              value: 31376f29c6332ea8c378152d5ccda1ba9dbcd7bb
            - name: pathInRepo
              value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
        params:
@@ -137,6 +137,49 @@ spec:
            workspace: docker-credentials
        runAfter:
          - fetch-repository
+      - name: run-image
+        taskSpec:
+          metadata: {}
+          params:
+            - name: docker-image
+              type: string
+              description: Docker image to run.
+              default: alpine:3.20
+          stepTemplate:
+            image: alpine:3.20
+            computeResources:
+              requests:
+                cpu: 10m
+                memory: 60Mi
+            workingDir: /workspace/source
+          workspaces:
+            - name: source
+              mountPath: /source
+            - name: cargo-cache
+              mountPath: /usr/local/cargo/registry
+              optional: true
+          steps:
+            - name: run
+              image: $(params.docker-image)
+              workingDir: "$(workspaces.source.path)"
+              command: ["cargo", "build"]
+              args: ["--no-default-features"]
+              env:
+                - name: CARGO_TARGET_DIR
+                  value: /target
+                - name: RUSTUP_PERMIT_COPY_RENAME
+                  value: "true"
+        workspaces:
+          - name: source
+            workspace: git-source
+          - name: cargo-cache
+            workspace: cargo-cache
+            subPath: none
+        runAfter:
+          - build-image
+        params:
+          - name: docker-image
+            value: "$(tasks.build-image.results.IMAGE_URL[1])"
    finally:
      - name: report-success
        when:
@@ -196,9 +239,61 @@ spec:
            value: failure
          - name: TARGET_URL
            value: "https://tekton.fizz.buzz/#/namespaces/$(context.pipelineRun.namespace)/pipelineruns/$(context.pipelineRun.name)"
+      - name: cargo-cache-autoclean
+        taskSpec:
+          metadata: {}
+          params:
+            - name: docker-image
+              type: string
+              description: Docker image to run.
+              default: alpine:3.20
+          stepTemplate:
+            image: alpine:3.20
+            computeResources:
+              requests:
+                cpu: 10m
+                memory: 600Mi
+            workingDir: /workspace/source
+          workspaces:
+            - name: source
+              mountPath: /source
+            - name: cargo-cache
+              mountPath: /usr/local/cargo/registry
+              optional: true
+          steps:
+            - name: run
+              image: $(params.docker-image)
+              workingDir: "$(workspaces.source.path)"
+              command: [cargo, cache, --autoclean]
+              args: []
+              env:
+                - name: RUSTUP_PERMIT_COPY_RENAME
+                  value: "true"
+        workspaces:
+          - name: source
+            workspace: git-source
+          - name: cargo-cache
+            workspace: cargo-cache
+        params:
+          - name: docker-image
+            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+        # matrix:
+        #   params:
+        #     - name: cache-subdir
+        #       value:
+        #         - none
+        #         - tracing
+        #         - compare
+        #         - default
+        #         - tracing-compare
+        #         - compare-foreign
+        #         - all
+        #         - wasm
+        #         - wasm-test
    workspaces:
      - name: git-source
      - name: docker-credentials
+      - name: cargo-cache
  workspaces:
    - name: git-source
      volumeClaimTemplate:
@@ -210,6 +305,9 @@ spec:
            requests:
              storage: 10Gi
      subPath: rust-source
+    - name: cargo-cache
+      persistentVolumeClaim:
+        claimName: natter-cargo-cache-build
    - name: docker-credentials
      secret:
        secretName: harbor-plain
--- a/.webhook_bridge/pipeline-rust-clippy.yaml
+++ b/.webhook_bridge/pipeline-rust-clippy.yaml
@@ -50,18 +50,6 @@ spec:
          - name: TARGET_URL
            value: "https://tekton.fizz.buzz/#/namespaces/$(context.pipelineRun.namespace)/pipelineruns/$(context.pipelineRun.name)"
      - name: fetch-repository
-        taskRef:
-          resolver: git
-          params:
-            - name: url
-              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
-            - name: revision
-              value: df36b3853a5657fd883015cdbf07ad6466918acf
-            - name: pathInRepo
-              value: task/git-clone/0.9/git-clone.yaml
-        workspaces:
-          - name: output
-            workspace: git-source
        params:
          - name: url
            value: $(params.REPO_URL)
@@ -69,6 +57,18 @@ spec:
            value: $(params.PULL_BASE_SHA)
          - name: deleteExisting
            value: "true"
+        taskRef:
+          params:
+            - name: url
+              value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
+            - name: revision
+              value: "31376f29c6332ea8c378152d5ccda1ba9dbcd7bb"
+            - name: pathInRepo
+              value: task/git-clone/0.1/git-clone.yaml
+          resolver: git
+        workspaces:
+          - name: output
+            workspace: git-source
      - name: get-git-commit-time
        taskSpec:
          metadata: {}
@@ -101,7 +101,7 @@ spec:
            - name: url
              value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
            - name: revision
-              value: 7ee31a185243ee6da13dcd26a592c585b64c80e5
+              value: 31376f29c6332ea8c378152d5ccda1ba9dbcd7bb
            - name: pathInRepo
              value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
        params:
@@ -177,6 +177,8 @@ spec:
              env:
                - name: CARGO_TARGET_DIR
                  value: /target
+                - name: RUSTUP_PERMIT_COPY_RENAME
+                  value: "true"
        workspaces:
          - name: source
            workspace: git-source
@@ -273,6 +275,9 @@ spec:
              workingDir: "$(workspaces.source.path)"
              command: [cargo, cache, --autoclean]
              args: []
+              env:
+                - name: RUSTUP_PERMIT_COPY_RENAME
+                  value: "true"
        workspaces:
          - name: source
            workspace: git-source