From 0b125fc88e42f58b12c52c8213acea615027b061 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Thu, 18 Jun 2026 23:59:30 -0400 Subject: [PATCH] Fix tekton pipelines. --- .dockerignore | 1 + .webhook_bridge/pipeline-build-hash.yaml | 104 ++++++++++-------- .../pipeline-foreign-document-test.yaml | 31 +++--- .webhook_bridge/pipeline-format.yaml | 31 +++--- .webhook_bridge/pipeline-rust-clippy.yaml | 31 +++--- .webhook_bridge/pipeline-rust-test.yaml | 31 +++--- 6 files changed, 131 insertions(+), 98 deletions(-) diff --git a/.dockerignore b/.dockerignore index df22a2d..113853a 100644 --- a/.dockerignore +++ b/.dockerignore @@ -3,3 +3,4 @@ target Cargo.lock notes/ .lighthouse/ +/.webhook_bridge/ diff --git a/.webhook_bridge/pipeline-build-hash.yaml b/.webhook_bridge/pipeline-build-hash.yaml index 901ca50..7037c8a 100644 --- 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: "296c1602f4827d75701663f614e09df933c15336" + - 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: 296c1602f4827d75701663f614e09df933c15336 - name: pathInRepo value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml params: @@ -145,9 +145,9 @@ spec: - name: docker-image type: string description: Docker image to run. - default: alpine:3.18 + default: alpine:3.20 stepTemplate: - image: alpine:3.18 + image: alpine:3.20 name: "" resources: requests: @@ -169,6 +169,8 @@ spec: env: - name: CARGO_TARGET_DIR value: /target + - name: RUSTUP_PERMIT_COPY_RENAME + value: "true" workspaces: - name: source workspace: git-source @@ -188,9 +190,9 @@ spec: - name: docker-image type: string description: Docker image to run. - default: alpine:3.18 + default: alpine:3.20 stepTemplate: - image: alpine:3.18 + image: alpine:3.20 name: "" resources: requests: @@ -212,6 +214,8 @@ spec: env: - name: CARGO_TARGET_DIR value: /target + - name: RUSTUP_PERMIT_COPY_RENAME + value: "true" workspaces: - name: source workspace: git-source @@ -231,9 +235,9 @@ spec: - name: docker-image type: string description: Docker image to run. - default: alpine:3.18 + default: alpine:3.20 stepTemplate: - image: alpine:3.18 + image: alpine:3.20 name: "" resources: requests: @@ -255,6 +259,8 @@ spec: env: - name: CARGO_TARGET_DIR value: /target + - name: RUSTUP_PERMIT_COPY_RENAME + value: "true" workspaces: - name: source workspace: git-source @@ -274,9 +280,9 @@ spec: - name: docker-image type: string description: Docker image to run. - default: alpine:3.18 + default: alpine:3.20 stepTemplate: - image: alpine:3.18 + image: alpine:3.20 name: "" resources: requests: @@ -298,6 +304,8 @@ spec: env: - name: CARGO_TARGET_DIR value: /target + - name: RUSTUP_PERMIT_COPY_RENAME + value: "true" workspaces: - name: source workspace: git-source @@ -317,9 +325,9 @@ spec: - name: docker-image type: string description: Docker image to run. - default: alpine:3.18 + default: alpine:3.20 stepTemplate: - image: alpine:3.18 + image: alpine:3.20 name: "" resources: requests: @@ -341,6 +349,8 @@ spec: env: - name: CARGO_TARGET_DIR value: /target + - name: RUSTUP_PERMIT_COPY_RENAME + value: "true" workspaces: - name: source workspace: git-source @@ -360,9 +370,9 @@ spec: - name: docker-image type: string description: Docker image to run. - default: alpine:3.18 + default: alpine:3.20 stepTemplate: - image: alpine:3.18 + image: alpine:3.20 name: "" resources: requests: @@ -389,6 +399,8 @@ spec: env: - name: CARGO_TARGET_DIR value: /target + - name: RUSTUP_PERMIT_COPY_RENAME + value: "true" workspaces: - name: source workspace: git-source @@ -408,9 +420,9 @@ spec: - name: docker-image type: string description: Docker image to run. - default: alpine:3.18 + default: alpine:3.20 stepTemplate: - image: alpine:3.18 + image: alpine:3.20 name: "" resources: requests: @@ -437,6 +449,8 @@ spec: env: - name: CARGO_TARGET_DIR value: /target + - name: RUSTUP_PERMIT_COPY_RENAME + value: "true" workspaces: - name: source workspace: git-source @@ -456,9 +470,9 @@ spec: - name: docker-image type: string description: Docker image to run. - default: alpine:3.18 + default: alpine:3.20 stepTemplate: - image: alpine:3.18 + image: alpine:3.20 name: "" resources: requests: @@ -491,6 +505,8 @@ spec: env: - name: CARGO_TARGET_DIR value: /target + - name: RUSTUP_PERMIT_COPY_RENAME + value: "true" workspaces: - name: source workspace: git-source @@ -510,9 +526,9 @@ spec: - name: docker-image type: string description: Docker image to run. - default: alpine:3.18 + default: alpine:3.20 stepTemplate: - image: alpine:3.18 + image: alpine:3.20 name: "" resources: requests: @@ -541,6 +557,8 @@ spec: env: - name: CARGO_TARGET_DIR value: /target + - name: RUSTUP_PERMIT_COPY_RENAME + value: "true" workspaces: - name: source workspace: git-source @@ -619,17 +637,13 @@ spec: - name: docker-image type: string description: Docker image to run. - default: alpine:3.18 - - name: cache-subdir - type: string - description: subPath used in the persistent volume for the cargo cache. - steptemplate: - image: alpine:3.18 - name: "" - resources: + default: alpine:3.20 + stepTemplate: + image: alpine:3.20 + computeResources: requests: cpu: 10m - memory: 60Mi + memory: 600Mi workingDir: /workspace/source workspaces: - name: source @@ -641,21 +655,19 @@ spec: - name: run image: $(params.docker-image) workingDir: "$(workspaces.source.path)" - command: ["ls", "$(workspaces.cargo-cache.path)"] - # command: [echo, $(params.cache-subdir)] - # command: [cargo, cache, --autoclean] + 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 - subPath: $(params.cache-subdir) params: - name: docker-image value: "$(tasks.build-image.results.IMAGE_URL[1])" - - name: cache-subdir - value: none # matrix: # params: # - name: cache-subdir diff --git a/.webhook_bridge/pipeline-foreign-document-test.yaml b/.webhook_bridge/pipeline-foreign-document-test.yaml index 8317eb1..05ebeab 100644 --- a/.webhook_bridge/pipeline-foreign-document-test.yaml +++ b/.webhook_bridge/pipeline-foreign-document-test.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: "296c1602f4827d75701663f614e09df933c15336" + - 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: 296c1602f4827d75701663f614e09df933c15336 - name: pathInRepo value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml params: @@ -165,6 +165,8 @@ spec: env: - name: CARGO_TARGET_DIR value: /target + - name: RUSTUP_PERMIT_COPY_RENAME + value: "true" workspaces: - name: source workspace: git-source @@ -261,6 +263,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 diff --git a/.webhook_bridge/pipeline-format.yaml b/.webhook_bridge/pipeline-format.yaml index 306eca2..82759b5 100644 --- a/.webhook_bridge/pipeline-format.yaml +++ b/.webhook_bridge/pipeline-format.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: "296c1602f4827d75701663f614e09df933c15336" + - 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: 296c1602f4827d75701663f614e09df933c15336 - name: pathInRepo value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml params: @@ -167,6 +167,8 @@ spec: env: - name: CARGO_TARGET_DIR value: /target + - name: RUSTUP_PERMIT_COPY_RENAME + value: "true" workspaces: - name: source workspace: git-source @@ -294,6 +296,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 diff --git a/.webhook_bridge/pipeline-rust-clippy.yaml b/.webhook_bridge/pipeline-rust-clippy.yaml index a1e281d..4d8a5fc 100644 --- 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: "296c1602f4827d75701663f614e09df933c15336" + - 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: 296c1602f4827d75701663f614e09df933c15336 - 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 diff --git a/.webhook_bridge/pipeline-rust-test.yaml b/.webhook_bridge/pipeline-rust-test.yaml index 74d2f21..0b3b363 100644 --- a/.webhook_bridge/pipeline-rust-test.yaml +++ b/.webhook_bridge/pipeline-rust-test.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: "296c1602f4827d75701663f614e09df933c15336" + - 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: 296c1602f4827d75701663f614e09df933c15336 - name: pathInRepo value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml params: @@ -176,6 +176,8 @@ spec: env: - name: CARGO_TARGET_DIR value: /target + - name: RUSTUP_PERMIT_COPY_RENAME + value: "true" workspaces: - name: source workspace: git-source @@ -272,6 +274,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