From bd68c3cbec15594e90826bbfe44f15df491dab42 Mon Sep 17 00:00:00 2001 From: unkin-agent Date: Fri, 9 Oct 2026 22:17:57 +1100 Subject: [PATCH] ci: pin show and pre-commit steps to docker-internal images with resources --- .woodpecker/build-almalinux9.yaml | 12 +++++++++++- .woodpecker/build-fedora42.yaml | 12 +++++++++++- .woodpecker/build-fedora43.yaml | 12 +++++++++++- .woodpecker/build-fedora44.yaml | 12 +++++++++++- .woodpecker/deploy-almalinux9.yaml | 12 +++++++++++- .woodpecker/deploy-fedora42.yaml | 10 ++++++++++ .woodpecker/deploy-fedora43.yaml | 10 ++++++++++ .woodpecker/deploy-fedora44.yaml | 10 ++++++++++ .woodpecker/pre-commit.yaml | 13 +++++++++++-- 9 files changed, 96 insertions(+), 7 deletions(-) diff --git a/.woodpecker/build-almalinux9.yaml b/.woodpecker/build-almalinux9.yaml index 86ab2b7..885264d 100644 --- a/.woodpecker/build-almalinux9.yaml +++ b/.woodpecker/build-almalinux9.yaml @@ -21,6 +21,16 @@ steps: cpu: 2 - name: show rpms - image: git.unkin.net/unkin/almalinux9-base:latest + image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9 commands: - find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm" + backend_options: + kubernetes: + serviceAccountName: default + resources: + requests: + memory: 512Mi + cpu: 1 + limits: + memory: 2Gi + cpu: 2 diff --git a/.woodpecker/build-fedora42.yaml b/.woodpecker/build-fedora42.yaml index 8e58994..0a3f8fc 100644 --- a/.woodpecker/build-fedora42.yaml +++ b/.woodpecker/build-fedora42.yaml @@ -21,6 +21,16 @@ steps: cpu: 2 - name: show rpms - image: git.unkin.net/unkin/fedora42-base:latest + image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-fedora42 commands: - find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm" + backend_options: + kubernetes: + serviceAccountName: default + resources: + requests: + memory: 512Mi + cpu: 1 + limits: + memory: 2Gi + cpu: 2 diff --git a/.woodpecker/build-fedora43.yaml b/.woodpecker/build-fedora43.yaml index 93bbb1e..bf85363 100644 --- a/.woodpecker/build-fedora43.yaml +++ b/.woodpecker/build-fedora43.yaml @@ -21,6 +21,16 @@ steps: cpu: 2 - name: show rpms - image: git.unkin.net/unkin/fedora43-base:latest + image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-fedora43 commands: - find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm" + backend_options: + kubernetes: + serviceAccountName: default + resources: + requests: + memory: 512Mi + cpu: 1 + limits: + memory: 2Gi + cpu: 2 diff --git a/.woodpecker/build-fedora44.yaml b/.woodpecker/build-fedora44.yaml index 8674580..815bfcb 100644 --- a/.woodpecker/build-fedora44.yaml +++ b/.woodpecker/build-fedora44.yaml @@ -21,6 +21,16 @@ steps: cpu: 2 - name: show rpms - image: git.unkin.net/unkin/fedora44-base:latest + image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-fedora44 commands: - find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm" + backend_options: + kubernetes: + serviceAccountName: default + resources: + requests: + memory: 512Mi + cpu: 1 + limits: + memory: 2Gi + cpu: 2 diff --git a/.woodpecker/deploy-almalinux9.yaml b/.woodpecker/deploy-almalinux9.yaml index c716c16..fcc028d 100644 --- a/.woodpecker/deploy-almalinux9.yaml +++ b/.woodpecker/deploy-almalinux9.yaml @@ -22,9 +22,19 @@ steps: cpu: 2 - name: show-rpms - image: git.unkin.net/unkin/almalinux9-base:latest + image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9 commands: - find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm" + backend_options: + kubernetes: + serviceAccountName: default + resources: + requests: + memory: 512Mi + cpu: 1 + limits: + memory: 2Gi + cpu: 2 depends_on: [build-rpms] - name: deploy-rpms diff --git a/.woodpecker/deploy-fedora42.yaml b/.woodpecker/deploy-fedora42.yaml index d30dba8..461af6d 100644 --- a/.woodpecker/deploy-fedora42.yaml +++ b/.woodpecker/deploy-fedora42.yaml @@ -25,6 +25,16 @@ steps: image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-fedora42 commands: - find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm" + backend_options: + kubernetes: + serviceAccountName: default + resources: + requests: + memory: 512Mi + cpu: 1 + limits: + memory: 2Gi + cpu: 2 depends_on: [build-rpms] - name: deploy-rpms diff --git a/.woodpecker/deploy-fedora43.yaml b/.woodpecker/deploy-fedora43.yaml index f8a350d..bb46d46 100644 --- a/.woodpecker/deploy-fedora43.yaml +++ b/.woodpecker/deploy-fedora43.yaml @@ -25,6 +25,16 @@ steps: image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-fedora43 commands: - find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm" + backend_options: + kubernetes: + serviceAccountName: default + resources: + requests: + memory: 512Mi + cpu: 1 + limits: + memory: 2Gi + cpu: 2 depends_on: [build-rpms] - name: deploy-rpms diff --git a/.woodpecker/deploy-fedora44.yaml b/.woodpecker/deploy-fedora44.yaml index 8d7ab45..e875c8c 100644 --- a/.woodpecker/deploy-fedora44.yaml +++ b/.woodpecker/deploy-fedora44.yaml @@ -25,6 +25,16 @@ steps: image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-fedora44 commands: - find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm" + backend_options: + kubernetes: + serviceAccountName: default + resources: + requests: + memory: 512Mi + cpu: 1 + limits: + memory: 2Gi + cpu: 2 depends_on: [build-rpms] - name: deploy-rpms diff --git a/.woodpecker/pre-commit.yaml b/.woodpecker/pre-commit.yaml index bf6529f..85d3e39 100644 --- a/.woodpecker/pre-commit.yaml +++ b/.woodpecker/pre-commit.yaml @@ -3,7 +3,16 @@ when: steps: - name: pre-commit - image: git.unkin.net/unkin/almalinux9-base:latest + image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/rpmbuilder:0.1.0-alma9 commands: - - dnf install uv make -y - uvx pre-commit run --all-files + backend_options: + kubernetes: + serviceAccountName: default + resources: + requests: + memory: 512Mi + cpu: 1 + limits: + memory: 2Gi + cpu: 2