Merge branch 'webhook_bridge'
All checks were successful
clippy Build clippy has succeeded
rust-test Build rust-test has succeeded
format Build format has succeeded
build Build build has succeeded

This commit is contained in:
Tom Alexander 2024-09-29 21:40:42 -04:00
commit 5f4d1a4202
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
8 changed files with 77 additions and 87 deletions

View File

@ -1,32 +0,0 @@
apiVersion: config.lighthouse.jenkins-x.io/v1alpha1
kind: TriggerConfig
spec:
postsubmits:
- name: build-poudboot
source: "pipeline-build-poudboot.yaml"
# Override https-based url from lighthouse events.
clone_uri: "git@code.fizz.buzz:talexander/poudboot.git"
branches:
- ^main$
- ^master$
- name: rust-test
source: "pipeline-rust-test.yaml"
# Override https-based url from lighthouse events.
clone_uri: "git@code.fizz.buzz:talexander/poudboot.git"
skip_branches:
# We already run on every commit, so running when the semver tags get pushed is causing needless double-processing.
- "^v[0-9]+\\.[0-9]+\\.[0-9]+$"
- name: rust-clippy
source: "pipeline-rust-clippy.yaml"
# Override https-based url from lighthouse events.
clone_uri: "git@code.fizz.buzz:talexander/poudboot.git"
skip_branches:
# We already run on every commit, so running when the semver tags get pushed is causing needless double-processing.
- "^v[0-9]+\\.[0-9]+\\.[0-9]+$"
- name: format
source: "pipeline-format.yaml"
# Override https-based url from lighthouse events.
clone_uri: "git@code.fizz.buzz:talexander/poudboot.git"
skip_branches:
# We already run on every commit, so running when the semver tags get pushed is causing needless double-processing.
- "^v[0-9]+\\.[0-9]+\\.[0-9]+$"

View File

@ -1,13 +1,15 @@
apiVersion: tekton.dev/v1beta1
apiVersion: tekton.dev/v1
kind: PipelineRun
metadata:
name: build-poudboot
name: build
spec:
timeouts:
pipeline: "2h0m0s"
tasks: "1h0m0s"
finally: "0h30m0s"
taskRunTemplate:
serviceAccountName: build-bot
pipelineSpec:
timeouts:
pipeline: "2h0m0s"
tasks: "1h0m0s"
finally: "0h30m0s"
params:
- name: image-name
description: The name for the built image
@ -66,7 +68,7 @@ spec:
value: $(params.PULL_BASE_SHA)
- name: deleteExisting
value: "true"
- name: build-image-runner
- name: build-image
taskRef:
resolver: git
params:
@ -75,7 +77,7 @@ spec:
- name: revision
value: df36b3853a5657fd883015cdbf07ad6466918acf
- name: pathInRepo
value: task/kaniko/0.6/kaniko.yaml
value: task/kaniko/0.6//kaniko.yaml
params:
- name: IMAGE
value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
@ -179,8 +181,6 @@ spec:
- name: docker-credentials
secret:
secretName: harbor-plain
serviceAccountName: build-bot
timeout: 240h0m0s
params:
- name: image-name
value: "harbor.fizz.buzz/private/poudboot"

View File

@ -1,13 +1,15 @@
apiVersion: tekton.dev/v1beta1
apiVersion: tekton.dev/v1
kind: PipelineRun
metadata:
name: rust-format
spec:
timeouts:
pipeline: "2h0m0s"
tasks: "1h0m0s"
finally: "0h30m0s"
taskRunTemplate:
serviceAccountName: build-bot
pipelineSpec:
timeouts:
pipeline: "2h0m0s"
tasks: "1h0m0s"
finally: "0h30m0s"
params:
- name: image-name
description: The name for the built image
@ -109,11 +111,10 @@ spec:
- name: docker-image
type: string
description: Docker image to run.
default: alpine:3.19
default: alpine:3.20
stepTemplate:
image: alpine:3.19
name: ""
resources:
image: alpine:3.20
computeResources:
requests:
cpu: 10m
memory: 600Mi
@ -240,11 +241,10 @@ spec:
- name: docker-image
type: string
description: Docker image to run.
default: alpine:3.19
default: alpine:3.20
stepTemplate:
image: alpine:3.19
name: ""
resources:
image: alpine:3.20
computeResources:
requests:
cpu: 10m
memory: 600Mi
@ -290,7 +290,6 @@ spec:
- name: docker-credentials
secret:
secretName: harbor-plain
serviceAccountName: build-bot
params:
- name: image-name
value: "harbor.fizz.buzz/private/poudboot-development"

View File

@ -1,13 +1,15 @@
apiVersion: tekton.dev/v1beta1
apiVersion: tekton.dev/v1
kind: PipelineRun
metadata:
name: rust-clippy
spec:
taskRunTemplate:
serviceAccountName: build-bot
timeouts:
pipeline: "2h0m0s"
tasks: "1h0m40s"
finally: "0h30m0s"
pipelineSpec:
timeouts:
pipeline: "2h0m0s"
tasks: "1h0m40s"
finally: "0h30m0s"
params:
- name: image-name
description: The name for the built image
@ -109,11 +111,10 @@ spec:
- name: docker-image
type: string
description: Docker image to run.
default: alpine:3.19
default: alpine:3.20
stepTemplate:
image: alpine:3.19
name: ""
resources:
image: alpine:3.20
computeResources:
requests:
cpu: 10m
memory: 600Mi
@ -219,11 +220,10 @@ spec:
- name: docker-image
type: string
description: Docker image to run.
default: alpine:3.19
default: alpine:3.20
stepTemplate:
image: alpine:3.19
name: ""
resources:
image: alpine:3.20
computeResources:
requests:
cpu: 10m
memory: 600Mi
@ -269,7 +269,6 @@ spec:
- name: docker-credentials
secret:
secretName: harbor-plain
serviceAccountName: build-bot
params:
- name: image-name
value: "harbor.fizz.buzz/private/poudboot-development"

View File

@ -1,13 +1,15 @@
apiVersion: tekton.dev/v1beta1
apiVersion: tekton.dev/v1
kind: PipelineRun
metadata:
name: rust-test
spec:
timeouts:
pipeline: "2h0m0s"
tasks: "1h0m40s"
finally: "0h30m0s"
taskRunTemplate:
serviceAccountName: build-bot
pipelineSpec:
timeouts:
pipeline: "2h0m0s"
tasks: "1h0m40s"
finally: "0h30m0s"
params:
- name: image-name
description: The name for the built image
@ -109,11 +111,10 @@ spec:
- name: docker-image
type: string
description: Docker image to run.
default: alpine:3.19
default: alpine:3.20
stepTemplate:
image: alpine:3.19
name: ""
resources:
image: alpine:3.20
computeResources:
requests:
cpu: 10m
memory: 600Mi
@ -209,11 +210,10 @@ spec:
- name: docker-image
type: string
description: Docker image to run.
default: alpine:3.19
default: alpine:3.20
stepTemplate:
image: alpine:3.19
name: ""
resources:
image: alpine:3.20
computeResources:
requests:
cpu: 10m
memory: 600Mi
@ -259,7 +259,6 @@ spec:
- name: docker-credentials
secret:
secretName: harbor-plain
serviceAccountName: build-bot
params:
- name: image-name
value: "harbor.fizz.buzz/private/poudboot-development"

View File

@ -0,0 +1,25 @@
version = "0.0.1"
[[push]]
name = "rust-test"
source = "pipeline-rust-test.yaml"
clone_uri = "git@code.fizz.buzz:talexander/poudboot.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/poudboot.git"
skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ]
[[push]]
name = "format"
source = "pipeline-format.yaml"
clone_uri = "git@code.fizz.buzz:talexander/poudboot.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/poudboot.git"
branches = [ "^main$", "^master$" ]

View File

@ -1,4 +1,4 @@
FROM rustlang/rust:nightly-alpine3.19 AS builder
FROM rustlang/rust:nightly-alpine3.20 AS builder
RUN apk add --no-cache musl-dev
@ -8,6 +8,6 @@ COPY . .
# TODO: Add static build, which currently errors due to proc_macro. RUSTFLAGS="-C target-feature=+crt-static"
RUN CARGO_TARGET_DIR=/target cargo build --profile release-lto
FROM alpine:3.19 AS runner
FROM alpine:3.20 AS runner
COPY --from=builder /target/release-lto/poudboot /usr/bin/

View File

@ -1,4 +1,4 @@
FROM rustlang/rust:nightly-alpine3.19 AS builder
FROM rustlang/rust:nightly-alpine3.20 AS builder
RUN apk add --no-cache musl-dev
RUN cargo install --locked --no-default-features --features ci-autoclean cargo-cache