From 807d28b9f6845b642e16c3c4edc332dea455aa3b Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Sun, 6 Sep 2026 18:24:15 -0400 Subject: [PATCH 1/6] Switch to buildah for the foreign document test. BuildKit is having issues with caching which is causing problems with long builds like compiling emacs from source. --- .../pipeline-foreign-document-test.yaml | 46 ++++++++++--------- .webhook_bridge/webhook_bridge.toml | 42 ++++++++--------- docker/organic_test/Dockerfile | 12 ++++- 3 files changed, 57 insertions(+), 43 deletions(-) diff --git a/.webhook_bridge/pipeline-foreign-document-test.yaml b/.webhook_bridge/pipeline-foreign-document-test.yaml index 9063cd2..85509e7 100644 --- a/.webhook_bridge/pipeline-foreign-document-test.yaml +++ b/.webhook_bridge/pipeline-foreign-document-test.yaml @@ -103,35 +103,39 @@ spec: - name: url value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git - name: revision - value: dda7b690195b43e8b9859d1caf5dcbf48588ade1 + value: 9c6d3bc418dc2f54d73bdfa984bce3eb6c65fd60 - name: pathInRepo - value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml + value: task/buildah-rootless-daemonless/0.1/buildah-rootless-daemonless.yaml params: - name: OUTPUT value: >- - type=image,"name=$(params.image-name):latest,$(params.image-name):$(tasks.fetch-repository.results.commit)",push=true,compression=zstd,compression-level=22,oci-mediatypes=true + $(params.image-name):$(tasks.fetch-repository.results.commit) - name: CONTEXT value: $(params.path-to-image-context) - name: DOCKERFILE value: $(params.path-to-dockerfile) - name: EXTRA_ARGS value: - - "--opt" - - "target=$(params.target-name)" - - --import-cache - - "type=registry,ref=$(params.image-name):buildcache" - - --export-cache - - "type=registry,ref=$(params.image-name):buildcache,mode=max,compression=zstd,compression-level=22,rewrite-timestamp=true,image-manifest=true,oci-mediatypes=true" - - --opt - - build-arg:SOURCE_DATE_EPOCH=$(tasks.get-git-commit-time.results.unix-time) - - name: BUILDKITD_TOML + - "--target" + - "$(params.target-name)" + - --cache-from + - "$(params.image-name)-buildcache" + - --cache-to + - "$(params.image-name)-buildcache" + - name: REGISTRIES_CONF value: | - debug = true - [registry."docker.io"] - mirrors = ["dockerhub.dockerhub.svc.cluster.local"] - [registry."dockerhub.dockerhub.svc.cluster.local"] - http = true - insecure = true + unqualified-search-registries = ["docker.io"] + + [[registry]] + location = "dockerhub.dockerhub.svc.cluster.local" + insecure = true + + [[registry]] + location = "docker.io" + + [[registry.mirror]] + location = "dockerhub.dockerhub.svc.cluster.local" # Replace with your mirror URL + insecure = true workspaces: - name: source workspace: git-source @@ -178,7 +182,7 @@ spec: - build-image params: - name: docker-image - value: "$(tasks.build-image.results.IMAGE_URL[1])" + value: "$(tasks.build-image.results.IMAGE_URL[0])" finally: - name: report-success when: @@ -275,7 +279,7 @@ spec: workspace: cargo-cache params: - name: docker-image - value: "$(tasks.build-image.results.IMAGE_URL[1])" + value: "$(tasks.build-image.results.IMAGE_URL[0])" workspaces: - name: git-source - name: docker-credentials @@ -305,4 +309,4 @@ spec: - name: path-to-image-context value: docker/organic_test/ - name: path-to-dockerfile - value: docker/organic_test/ + value: docker/organic_test/Dockerfile diff --git a/.webhook_bridge/webhook_bridge.toml b/.webhook_bridge/webhook_bridge.toml index cef66b4..2d60af0 100644 --- a/.webhook_bridge/webhook_bridge.toml +++ b/.webhook_bridge/webhook_bridge.toml @@ -1,31 +1,31 @@ version = "0.0.1" -[[push]] - name = "rust-test" - source = "pipeline-rust-test.yaml" - clone_uri = "git@code.fizz.buzz:talexander/organic.git" - skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ] +# [[push]] +# name = "rust-test" +# source = "pipeline-rust-test.yaml" +# clone_uri = "git@code.fizz.buzz:talexander/organic.git" +# skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ] [[push]] name = "foreign-document-test" source = "pipeline-foreign-document-test.yaml" clone_uri = "git@code.fizz.buzz:talexander/organic.git" - branches = [ "^main$", "^master$" ] + branches = [ "^main$", "^master$", "^buildah$" ] -[[push]] - name = "clippy" - source = "pipeline-rust-clippy.yaml" - clone_uri = "git@code.fizz.buzz:talexander/organic.git" - skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ] +# [[push]] +# name = "clippy" +# source = "pipeline-rust-clippy.yaml" +# clone_uri = "git@code.fizz.buzz:talexander/organic.git" +# skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ] -[[push]] - name = "format" - source = "pipeline-format.yaml" - clone_uri = "git@code.fizz.buzz:talexander/organic.git" - skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ] +# [[push]] +# name = "format" +# source = "pipeline-format.yaml" +# clone_uri = "git@code.fizz.buzz:talexander/organic.git" +# skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ] -[[push]] - name = "build" - source = "pipeline-build-hash.yaml" - clone_uri = "git@code.fizz.buzz:talexander/organic.git" - branches = [ "^main$", "^master$" ] +# [[push]] +# name = "build" +# source = "pipeline-build-hash.yaml" +# clone_uri = "git@code.fizz.buzz:talexander/organic.git" +# branches = [ "^main$", "^master$" ] diff --git a/docker/organic_test/Dockerfile b/docker/organic_test/Dockerfile index 814ffe0..a6da39c 100644 --- a/docker/organic_test/Dockerfile +++ b/docker/organic_test/Dockerfile @@ -19,7 +19,17 @@ RUN apk add --no-cache build-base musl-dev git autoconf make texinfo gnutls-dev FROM build AS build-emacs ARG EMACS_REPO ARG EMACS_VERSION -ADD "$EMACS_REPO#$EMACS_VERSION" /root/emacs + +RUN < Date: Thu, 15 Oct 2026 20:34:17 -0400 Subject: [PATCH 2/6] Migrate the rust test to buildah. --- .webhook_bridge/pipeline-rust-test.yaml | 48 +++++++++++++------------ .webhook_bridge/webhook_bridge.toml | 18 +++++----- 2 files changed, 35 insertions(+), 31 deletions(-) diff --git a/.webhook_bridge/pipeline-rust-test.yaml b/.webhook_bridge/pipeline-rust-test.yaml index d56cd7b..ea4378b 100644 --- a/.webhook_bridge/pipeline-rust-test.yaml +++ b/.webhook_bridge/pipeline-rust-test.yaml @@ -103,35 +103,39 @@ spec: - name: url value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git - name: revision - value: dda7b690195b43e8b9859d1caf5dcbf48588ade1 + value: 9c6d3bc418dc2f54d73bdfa984bce3eb6c65fd60 - name: pathInRepo - value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml + value: task/buildah-rootless-daemonless/0.1/buildah-rootless-daemonless.yaml params: - name: OUTPUT value: >- - type=image,"name=$(params.image-name):latest,$(params.image-name):$(tasks.fetch-repository.results.commit)",push=true,compression=zstd,compression-level=22,oci-mediatypes=true + $(params.image-name):$(tasks.fetch-repository.results.commit) - name: CONTEXT value: $(params.path-to-image-context) - name: DOCKERFILE value: $(params.path-to-dockerfile) - name: EXTRA_ARGS value: - - "--opt" - - "target=$(params.target-name)" - - --import-cache - - "type=registry,ref=$(params.image-name):buildcache" - - --export-cache - - "type=registry,ref=$(params.image-name):buildcache,mode=max,compression=zstd,compression-level=22,rewrite-timestamp=true,image-manifest=true,oci-mediatypes=true" - - --opt - - build-arg:SOURCE_DATE_EPOCH=$(tasks.get-git-commit-time.results.unix-time) - - name: BUILDKITD_TOML + - "--target" + - "$(params.target-name)" + - --cache-from + - "$(params.image-name)-buildcache" + - --cache-to + - "$(params.image-name)-buildcache" + - name: REGISTRIES_CONF value: | - debug = true - [registry."docker.io"] - mirrors = ["dockerhub.dockerhub.svc.cluster.local"] - [registry."dockerhub.dockerhub.svc.cluster.local"] - http = true - insecure = true + unqualified-search-registries = ["docker.io"] + + [[registry]] + location = "dockerhub.dockerhub.svc.cluster.local" + insecure = true + + [[registry]] + location = "docker.io" + + [[registry.mirror]] + location = "dockerhub.dockerhub.svc.cluster.local" # Replace with your mirror URL + insecure = true workspaces: - name: source workspace: git-source @@ -139,7 +143,7 @@ spec: workspace: docker-credentials runAfter: - fetch-repository - - name: run-cargo-test + - name: run-test taskSpec: metadata: {} params: @@ -189,7 +193,7 @@ spec: - build-image params: - name: docker-image - value: "$(tasks.build-image.results.IMAGE_URL[1])" + value: "$(tasks.build-image.results.IMAGE_URL[0])" finally: - name: report-success when: @@ -286,7 +290,7 @@ spec: workspace: cargo-cache params: - name: docker-image - value: "$(tasks.build-image.results.IMAGE_URL[1])" + value: "$(tasks.build-image.results.IMAGE_URL[0])" workspaces: - name: git-source - name: docker-credentials @@ -316,4 +320,4 @@ spec: - name: path-to-image-context value: docker/organic_test/ - name: path-to-dockerfile - value: docker/organic_test/ + value: docker/organic_test/Dockerfile diff --git a/.webhook_bridge/webhook_bridge.toml b/.webhook_bridge/webhook_bridge.toml index 2d60af0..531a1fe 100644 --- a/.webhook_bridge/webhook_bridge.toml +++ b/.webhook_bridge/webhook_bridge.toml @@ -1,16 +1,16 @@ version = "0.0.1" -# [[push]] -# name = "rust-test" -# source = "pipeline-rust-test.yaml" -# clone_uri = "git@code.fizz.buzz:talexander/organic.git" -# skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ] - [[push]] - name = "foreign-document-test" - source = "pipeline-foreign-document-test.yaml" + name = "rust-test" + source = "pipeline-rust-test.yaml" clone_uri = "git@code.fizz.buzz:talexander/organic.git" - branches = [ "^main$", "^master$", "^buildah$" ] + skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ] + +# [[push]] +# name = "foreign-document-test" +# source = "pipeline-foreign-document-test.yaml" +# clone_uri = "git@code.fizz.buzz:talexander/organic.git" +# branches = [ "^main$", "^master$", "^buildah$" ] # [[push]] # name = "clippy" From 438ca5324fbd53ab1193cce71de9c7fa269482fa Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Fri, 16 Oct 2026 01:27:06 -0400 Subject: [PATCH 3/6] Migrate clippy to buildah. --- .webhook_bridge/pipeline-rust-clippy.yaml | 52 ++++++++++++----------- .webhook_bridge/webhook_bridge.toml | 20 ++++----- 2 files changed, 38 insertions(+), 34 deletions(-) diff --git a/.webhook_bridge/pipeline-rust-clippy.yaml b/.webhook_bridge/pipeline-rust-clippy.yaml index 7ca6a23..553a3aa 100644 --- a/.webhook_bridge/pipeline-rust-clippy.yaml +++ b/.webhook_bridge/pipeline-rust-clippy.yaml @@ -5,12 +5,12 @@ metadata: labels: pdb: protect spec: - taskRunTemplate: - serviceAccountName: build-bot timeouts: pipeline: "2h0m0s" tasks: "1h0m40s" finally: "0h30m0s" + taskRunTemplate: + serviceAccountName: build-bot pipelineSpec: params: - name: image-name @@ -103,35 +103,39 @@ spec: - name: url value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git - name: revision - value: dda7b690195b43e8b9859d1caf5dcbf48588ade1 + value: 9c6d3bc418dc2f54d73bdfa984bce3eb6c65fd60 - name: pathInRepo - value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml + value: task/buildah-rootless-daemonless/0.1/buildah-rootless-daemonless.yaml params: - name: OUTPUT value: >- - type=image,"name=$(params.image-name):latest,$(params.image-name):$(tasks.fetch-repository.results.commit)",push=true,compression=zstd,compression-level=22,oci-mediatypes=true + $(params.image-name):$(tasks.fetch-repository.results.commit) - name: CONTEXT value: $(params.path-to-image-context) - name: DOCKERFILE value: $(params.path-to-dockerfile) - name: EXTRA_ARGS value: - - "--opt" - - "target=$(params.target-name)" - - --import-cache - - "type=registry,ref=$(params.image-name):buildcache" - - --export-cache - - "type=registry,ref=$(params.image-name):buildcache,mode=max,compression=zstd,compression-level=22,rewrite-timestamp=true,image-manifest=true,oci-mediatypes=true" - - --opt - - build-arg:SOURCE_DATE_EPOCH=$(tasks.get-git-commit-time.results.unix-time) - - name: BUILDKITD_TOML + - "--target" + - "$(params.target-name)" + - --cache-from + - "$(params.image-name)-buildcache" + - --cache-to + - "$(params.image-name)-buildcache" + - name: REGISTRIES_CONF value: | - debug = true - [registry."docker.io"] - mirrors = ["dockerhub.dockerhub.svc.cluster.local"] - [registry."dockerhub.dockerhub.svc.cluster.local"] - http = true - insecure = true + unqualified-search-registries = ["docker.io"] + + [[registry]] + location = "dockerhub.dockerhub.svc.cluster.local" + insecure = true + + [[registry]] + location = "docker.io" + + [[registry.mirror]] + location = "dockerhub.dockerhub.svc.cluster.local" # Replace with your mirror URL + insecure = true workspaces: - name: source workspace: git-source @@ -139,7 +143,7 @@ spec: workspace: docker-credentials runAfter: - fetch-repository - - name: run-cargo-clippy + - name: run-test taskSpec: metadata: {} params: @@ -190,7 +194,7 @@ spec: - build-image params: - name: docker-image - value: "$(tasks.build-image.results.IMAGE_URL[1])" + value: "$(tasks.build-image.results.IMAGE_URL[0])" finally: - name: report-success when: @@ -287,7 +291,7 @@ spec: workspace: cargo-cache params: - name: docker-image - value: "$(tasks.build-image.results.IMAGE_URL[1])" + value: "$(tasks.build-image.results.IMAGE_URL[0])" workspaces: - name: git-source - name: docker-credentials @@ -317,4 +321,4 @@ spec: - name: path-to-image-context value: docker/organic_development/ - name: path-to-dockerfile - value: docker/organic_development/ + value: docker/organic_development/Dockerfile diff --git a/.webhook_bridge/webhook_bridge.toml b/.webhook_bridge/webhook_bridge.toml index 531a1fe..15dff7b 100644 --- a/.webhook_bridge/webhook_bridge.toml +++ b/.webhook_bridge/webhook_bridge.toml @@ -1,10 +1,10 @@ version = "0.0.1" -[[push]] - name = "rust-test" - source = "pipeline-rust-test.yaml" - clone_uri = "git@code.fizz.buzz:talexander/organic.git" - skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ] +# [[push]] +# name = "rust-test" +# source = "pipeline-rust-test.yaml" +# clone_uri = "git@code.fizz.buzz:talexander/organic.git" +# skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ] # [[push]] # name = "foreign-document-test" @@ -12,11 +12,11 @@ version = "0.0.1" # clone_uri = "git@code.fizz.buzz:talexander/organic.git" # branches = [ "^main$", "^master$", "^buildah$" ] -# [[push]] -# name = "clippy" -# source = "pipeline-rust-clippy.yaml" -# clone_uri = "git@code.fizz.buzz:talexander/organic.git" -# skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ] +[[push]] + name = "clippy" + source = "pipeline-rust-clippy.yaml" + clone_uri = "git@code.fizz.buzz:talexander/organic.git" + skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ] # [[push]] # name = "format" From 2ff270e722cd3acee388881b8f3e5fd734d2e224 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Fri, 16 Oct 2026 01:39:10 -0400 Subject: [PATCH 4/6] Migrate format to buildah. --- .webhook_bridge/pipeline-format.yaml | 48 +++++++++++++++------------- .webhook_bridge/webhook_bridge.toml | 16 +++++----- 2 files changed, 34 insertions(+), 30 deletions(-) diff --git a/.webhook_bridge/pipeline-format.yaml b/.webhook_bridge/pipeline-format.yaml index cb9aaf2..4a9e41e 100644 --- a/.webhook_bridge/pipeline-format.yaml +++ b/.webhook_bridge/pipeline-format.yaml @@ -7,7 +7,7 @@ metadata: spec: timeouts: pipeline: "2h0m0s" - tasks: "1h0m0s" + tasks: "1h0m40s" finally: "0h30m0s" taskRunTemplate: serviceAccountName: build-bot @@ -103,35 +103,39 @@ spec: - name: url value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git - name: revision - value: dda7b690195b43e8b9859d1caf5dcbf48588ade1 + value: 9c6d3bc418dc2f54d73bdfa984bce3eb6c65fd60 - name: pathInRepo - value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml + value: task/buildah-rootless-daemonless/0.1/buildah-rootless-daemonless.yaml params: - name: OUTPUT value: >- - type=image,"name=$(params.image-name):latest,$(params.image-name):$(tasks.fetch-repository.results.commit)",push=true,compression=zstd,compression-level=22,oci-mediatypes=true + $(params.image-name):$(tasks.fetch-repository.results.commit) - name: CONTEXT value: $(params.path-to-image-context) - name: DOCKERFILE value: $(params.path-to-dockerfile) - name: EXTRA_ARGS value: - - "--opt" - - "target=$(params.target-name)" - - --import-cache - - "type=registry,ref=$(params.image-name):buildcache" - - --export-cache - - "type=registry,ref=$(params.image-name):buildcache,mode=max,compression=zstd,compression-level=22,rewrite-timestamp=true,image-manifest=true,oci-mediatypes=true" - - --opt - - build-arg:SOURCE_DATE_EPOCH=$(tasks.get-git-commit-time.results.unix-time) - - name: BUILDKITD_TOML + - "--target" + - "$(params.target-name)" + - --cache-from + - "$(params.image-name)-buildcache" + - --cache-to + - "$(params.image-name)-buildcache" + - name: REGISTRIES_CONF value: | - debug = true - [registry."docker.io"] - mirrors = ["dockerhub.dockerhub.svc.cluster.local"] - [registry."dockerhub.dockerhub.svc.cluster.local"] - http = true - insecure = true + unqualified-search-registries = ["docker.io"] + + [[registry]] + location = "dockerhub.dockerhub.svc.cluster.local" + insecure = true + + [[registry]] + location = "docker.io" + + [[registry.mirror]] + location = "dockerhub.dockerhub.svc.cluster.local" # Replace with your mirror URL + insecure = true workspaces: - name: source workspace: git-source @@ -180,7 +184,7 @@ spec: - build-image params: - name: docker-image - value: "$(tasks.build-image.results.IMAGE_URL[1])" + value: "$(tasks.build-image.results.IMAGE_URL[0])" - name: commit-changes taskRef: resolver: git @@ -308,7 +312,7 @@ spec: workspace: cargo-cache params: - name: docker-image - value: "$(tasks.build-image.results.IMAGE_URL[1])" + value: "$(tasks.build-image.results.IMAGE_URL[0])" workspaces: - name: git-source - name: docker-credentials @@ -338,4 +342,4 @@ spec: - name: path-to-image-context value: docker/organic_development/ - name: path-to-dockerfile - value: docker/organic_development/ + value: docker/organic_development/Dockerfile diff --git a/.webhook_bridge/webhook_bridge.toml b/.webhook_bridge/webhook_bridge.toml index 15dff7b..e522654 100644 --- a/.webhook_bridge/webhook_bridge.toml +++ b/.webhook_bridge/webhook_bridge.toml @@ -12,18 +12,18 @@ version = "0.0.1" # clone_uri = "git@code.fizz.buzz:talexander/organic.git" # branches = [ "^main$", "^master$", "^buildah$" ] -[[push]] - name = "clippy" - source = "pipeline-rust-clippy.yaml" - clone_uri = "git@code.fizz.buzz:talexander/organic.git" - skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ] - # [[push]] -# name = "format" -# source = "pipeline-format.yaml" +# name = "clippy" +# source = "pipeline-rust-clippy.yaml" # clone_uri = "git@code.fizz.buzz:talexander/organic.git" # skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ] +[[push]] + name = "format" + source = "pipeline-format.yaml" + clone_uri = "git@code.fizz.buzz:talexander/organic.git" + skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ] + # [[push]] # name = "build" # source = "pipeline-build-hash.yaml" From 51922d1438f2ecf384ab28820240439f8bb637d4 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Sat, 17 Oct 2026 10:46:28 -0400 Subject: [PATCH 5/6] Migrate build hash. --- .webhook_bridge/pipeline-build-hash.yaml | 96 +++++++++++------------- .webhook_bridge/webhook_bridge.toml | 18 ++--- 2 files changed, 52 insertions(+), 62 deletions(-) diff --git a/.webhook_bridge/pipeline-build-hash.yaml b/.webhook_bridge/pipeline-build-hash.yaml index 84e4834..2e85e6f 100644 --- a/.webhook_bridge/pipeline-build-hash.yaml +++ b/.webhook_bridge/pipeline-build-hash.yaml @@ -7,7 +7,7 @@ metadata: spec: timeouts: pipeline: "2h0m0s" - tasks: "1h0m0s" + tasks: "1h0m40s" finally: "0h30m0s" taskRunTemplate: serviceAccountName: build-bot @@ -103,35 +103,39 @@ spec: - name: url value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git - name: revision - value: dda7b690195b43e8b9859d1caf5dcbf48588ade1 + value: 9c6d3bc418dc2f54d73bdfa984bce3eb6c65fd60 - name: pathInRepo - value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml + value: task/buildah-rootless-daemonless/0.1/buildah-rootless-daemonless.yaml params: - name: OUTPUT value: >- - type=image,"name=$(params.image-name):latest,$(params.image-name):$(tasks.fetch-repository.results.commit)",push=true,compression=zstd,compression-level=22,oci-mediatypes=true + $(params.image-name):$(tasks.fetch-repository.results.commit) - name: CONTEXT value: $(params.path-to-image-context) - name: DOCKERFILE value: $(params.path-to-dockerfile) - name: EXTRA_ARGS value: - - "--opt" - - "target=$(params.target-name)" - - --import-cache - - "type=registry,ref=$(params.image-name):buildcache" - - --export-cache - - "type=registry,ref=$(params.image-name):buildcache,mode=max,compression=zstd,compression-level=22,rewrite-timestamp=true,image-manifest=true,oci-mediatypes=true" - - --opt - - build-arg:SOURCE_DATE_EPOCH=$(tasks.get-git-commit-time.results.unix-time) - - name: BUILDKITD_TOML + - "--target" + - "$(params.target-name)" + - --cache-from + - "$(params.image-name)-buildcache" + - --cache-to + - "$(params.image-name)-buildcache" + - name: REGISTRIES_CONF value: | - debug = true - [registry."docker.io"] - mirrors = ["dockerhub.dockerhub.svc.cluster.local"] - [registry."dockerhub.dockerhub.svc.cluster.local"] - http = true - insecure = true + unqualified-search-registries = ["docker.io"] + + [[registry]] + location = "dockerhub.dockerhub.svc.cluster.local" + insecure = true + + [[registry]] + location = "docker.io" + + [[registry.mirror]] + location = "dockerhub.dockerhub.svc.cluster.local" # Replace with your mirror URL + insecure = true workspaces: - name: source workspace: git-source @@ -153,7 +157,7 @@ spec: computeResources: requests: cpu: 10m - memory: 60Mi + memory: 600Mi workingDir: /workspace/source workspaces: - name: source @@ -182,7 +186,7 @@ spec: - build-image params: - name: docker-image - value: "$(tasks.build-image.results.IMAGE_URL[1])" + value: "$(tasks.build-image.results.IMAGE_URL[0])" ############# - name: run-image-tracing taskSpec: @@ -197,7 +201,7 @@ spec: computeResources: requests: cpu: 10m - memory: 60Mi + memory: 600Mi workingDir: /workspace/source workspaces: - name: source @@ -226,7 +230,7 @@ spec: - run-image-none params: - name: docker-image - value: "$(tasks.build-image.results.IMAGE_URL[1])" + value: "$(tasks.build-image.results.IMAGE_URL[0])" ############# - name: run-image-compare taskSpec: @@ -241,7 +245,7 @@ spec: computeResources: requests: cpu: 10m - memory: 60Mi + memory: 600Mi workingDir: /workspace/source workspaces: - name: source @@ -270,7 +274,7 @@ spec: - run-image-tracing params: - name: docker-image - value: "$(tasks.build-image.results.IMAGE_URL[1])" + value: "$(tasks.build-image.results.IMAGE_URL[0])" ############# - name: run-image-default taskSpec: @@ -285,7 +289,7 @@ spec: computeResources: requests: cpu: 10m - memory: 60Mi + memory: 600Mi workingDir: /workspace/source workspaces: - name: source @@ -314,7 +318,7 @@ spec: - run-image-compare params: - name: docker-image - value: "$(tasks.build-image.results.IMAGE_URL[1])" + value: "$(tasks.build-image.results.IMAGE_URL[0])" ############# - name: run-image-tracing-compare taskSpec: @@ -329,7 +333,7 @@ spec: computeResources: requests: cpu: 10m - memory: 60Mi + memory: 600Mi workingDir: /workspace/source workspaces: - name: source @@ -358,7 +362,7 @@ spec: - run-image-default params: - name: docker-image - value: "$(tasks.build-image.results.IMAGE_URL[1])" + value: "$(tasks.build-image.results.IMAGE_URL[0])" ############# - name: run-image-compare-foreign taskSpec: @@ -373,7 +377,7 @@ spec: computeResources: requests: cpu: 10m - memory: 60Mi + memory: 600Mi workingDir: /workspace/source workspaces: - name: source @@ -407,7 +411,7 @@ spec: - run-image-tracing-compare params: - name: docker-image - value: "$(tasks.build-image.results.IMAGE_URL[1])" + value: "$(tasks.build-image.results.IMAGE_URL[0])" ############# - name: run-image-all taskSpec: @@ -422,7 +426,7 @@ spec: computeResources: requests: cpu: 10m - memory: 60Mi + memory: 600Mi workingDir: /workspace/source workspaces: - name: source @@ -456,7 +460,7 @@ spec: - run-image-compare-foreign params: - name: docker-image - value: "$(tasks.build-image.results.IMAGE_URL[1])" + value: "$(tasks.build-image.results.IMAGE_URL[0])" ############# - name: run-image-wasm taskSpec: @@ -471,7 +475,7 @@ spec: computeResources: requests: cpu: 10m - memory: 60Mi + memory: 600Mi workingDir: /workspace/source workspaces: - name: source @@ -511,7 +515,7 @@ spec: - run-image-all params: - name: docker-image - value: "$(tasks.build-image.results.IMAGE_URL[1])" + value: "$(tasks.build-image.results.IMAGE_URL[0])" ############# - name: run-image-wasm-test taskSpec: @@ -526,7 +530,7 @@ spec: computeResources: requests: cpu: 10m - memory: 60Mi + memory: 600Mi workingDir: /workspace/source workspaces: - name: source @@ -562,8 +566,7 @@ spec: - run-image-wasm params: - name: docker-image - value: "$(tasks.build-image.results.IMAGE_URL[1])" - ############# + value: "$(tasks.build-image.results.IMAGE_URL[0])" finally: - name: report-success when: @@ -660,20 +663,7 @@ spec: 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 + value: "$(tasks.build-image.results.IMAGE_URL[0])" workspaces: - name: git-source - name: docker-credentials @@ -703,4 +693,4 @@ spec: - name: path-to-image-context value: . - name: path-to-dockerfile - value: docker/organic_development/ + value: docker/organic_development/Dockerfile diff --git a/.webhook_bridge/webhook_bridge.toml b/.webhook_bridge/webhook_bridge.toml index e522654..3d8ec37 100644 --- a/.webhook_bridge/webhook_bridge.toml +++ b/.webhook_bridge/webhook_bridge.toml @@ -18,14 +18,14 @@ version = "0.0.1" # clone_uri = "git@code.fizz.buzz:talexander/organic.git" # skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ] -[[push]] - name = "format" - source = "pipeline-format.yaml" - clone_uri = "git@code.fizz.buzz:talexander/organic.git" - skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ] - # [[push]] -# name = "build" -# source = "pipeline-build-hash.yaml" +# name = "format" +# source = "pipeline-format.yaml" # clone_uri = "git@code.fizz.buzz:talexander/organic.git" -# branches = [ "^main$", "^master$" ] +# skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ] + +[[push]] + name = "build" + source = "pipeline-build-hash.yaml" + clone_uri = "git@code.fizz.buzz:talexander/organic.git" + branches = [ "^main$", "^master$", "^buildah$" ] From 71c3e629a1e519954cacfbae376d8cac17d1d5eb Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Sat, 17 Oct 2026 11:29:09 -0400 Subject: [PATCH 6/6] Restore original trigger file. --- .webhook_bridge/webhook_bridge.toml | 42 ++++++++++++++--------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.webhook_bridge/webhook_bridge.toml b/.webhook_bridge/webhook_bridge.toml index 3d8ec37..cef66b4 100644 --- a/.webhook_bridge/webhook_bridge.toml +++ b/.webhook_bridge/webhook_bridge.toml @@ -1,31 +1,31 @@ version = "0.0.1" -# [[push]] -# name = "rust-test" -# source = "pipeline-rust-test.yaml" -# clone_uri = "git@code.fizz.buzz:talexander/organic.git" -# skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ] +[[push]] + name = "rust-test" + source = "pipeline-rust-test.yaml" + clone_uri = "git@code.fizz.buzz:talexander/organic.git" + skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ] -# [[push]] -# name = "foreign-document-test" -# source = "pipeline-foreign-document-test.yaml" -# clone_uri = "git@code.fizz.buzz:talexander/organic.git" -# branches = [ "^main$", "^master$", "^buildah$" ] +[[push]] + name = "foreign-document-test" + source = "pipeline-foreign-document-test.yaml" + clone_uri = "git@code.fizz.buzz:talexander/organic.git" + branches = [ "^main$", "^master$" ] -# [[push]] -# name = "clippy" -# source = "pipeline-rust-clippy.yaml" -# clone_uri = "git@code.fizz.buzz:talexander/organic.git" -# skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ] +[[push]] + name = "clippy" + source = "pipeline-rust-clippy.yaml" + clone_uri = "git@code.fizz.buzz:talexander/organic.git" + skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ] -# [[push]] -# name = "format" -# source = "pipeline-format.yaml" -# clone_uri = "git@code.fizz.buzz:talexander/organic.git" -# skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ] +[[push]] + name = "format" + source = "pipeline-format.yaml" + clone_uri = "git@code.fizz.buzz:talexander/organic.git" + skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ] [[push]] name = "build" source = "pipeline-build-hash.yaml" clone_uri = "git@code.fizz.buzz:talexander/organic.git" - branches = [ "^main$", "^master$", "^buildah$" ] + branches = [ "^main$", "^master$" ]