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"