From 92eaef228abbcee3480c0bc5ee138c48a37ed8e3 Mon Sep 17 00:00:00 2001 From: unkin-agent Date: Fri, 2 Oct 2026 23:55:49 +1000 Subject: [PATCH] ci: move Go steps to gobuilder, enable S3 build cache (#2) Why: standardize on the estate gobuilder image and cut CI time with the shared S3-backed Go build cache. - Replace golang:1.25 / almalinux9-gobuilder:20260606 with gobuilder:0.1.2-alma9 on every Go-toolchain step - Add GOCACHEPROG + GOCACHE_* env and AWS creds from org secrets - Bump k8s resource requests/limits for compile+cache overhead - rpmbuilder/base steps in release.yml untouched (no Go toolchain) Reviewed-on: https://git.unkin.net/unkin/passv/pulls/2 Co-authored-by: unkin-agent Co-committed-by: unkin-agent --- .woodpecker/build.yml | 18 +++++++++++++++--- .woodpecker/pre-commit.yaml | 14 +++++++++++++- .woodpecker/release.yml | 18 +++++++++++++++--- .woodpecker/test.yml | 36 ++++++++++++++++++++++++++++++------ 4 files changed, 73 insertions(+), 13 deletions(-) diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml index 45fb3b9..17f63d5 100644 --- a/.woodpecker/build.yml +++ b/.woodpecker/build.yml @@ -3,12 +3,24 @@ when: steps: - name: build - image: golang:1.25 + image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/gobuilder:0.1.2-alma9 commands: - make build + environment: + GOCACHE_S3_BUCKET: gocache + GOCACHE_S3_REGION: us-east-1 + GOCACHE_S3_ENDPOINT_URL: https://s3.ceph.unkin.net + GOCACHE_S3_PATH_STYLE: "true" + GOCACHE_KEY_PREFIX: ci-passv + GOCACHE_METRICS: "true" + GOCACHEPROG: go-cache-plugin --cache-dir=/tmp/gocache + AWS_ACCESS_KEY_ID: + from_secret: GOCACHE_AWS_ACCESS_KEY_ID + AWS_SECRET_ACCESS_KEY: + from_secret: GOCACHE_AWS_SECRET_ACCESS_KEY backend_options: kubernetes: serviceAccountName: default resources: - requests: {memory: 512Mi, cpu: 1} - limits: {memory: 2Gi, cpu: 2} + requests: {memory: 1Gi, cpu: 1} + limits: {memory: 3Gi, cpu: 2} diff --git a/.woodpecker/pre-commit.yaml b/.woodpecker/pre-commit.yaml index bd69300..045fb0b 100644 --- a/.woodpecker/pre-commit.yaml +++ b/.woodpecker/pre-commit.yaml @@ -3,9 +3,21 @@ when: steps: - name: pre-commit - image: git.unkin.net/unkin/almalinux9-gobuilder:20260606 + image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/gobuilder:0.1.2-alma9 commands: - uvx pre-commit run --all-files + environment: + GOCACHE_S3_BUCKET: gocache + GOCACHE_S3_REGION: us-east-1 + GOCACHE_S3_ENDPOINT_URL: https://s3.ceph.unkin.net + GOCACHE_S3_PATH_STYLE: "true" + GOCACHE_KEY_PREFIX: ci-passv + GOCACHE_METRICS: "true" + GOCACHEPROG: go-cache-plugin --cache-dir=/tmp/gocache + AWS_ACCESS_KEY_ID: + from_secret: GOCACHE_AWS_ACCESS_KEY_ID + AWS_SECRET_ACCESS_KEY: + from_secret: GOCACHE_AWS_SECRET_ACCESS_KEY backend_options: kubernetes: serviceAccountName: default diff --git a/.woodpecker/release.yml b/.woodpecker/release.yml index f1a4b5c..838f46c 100644 --- a/.woodpecker/release.yml +++ b/.woodpecker/release.yml @@ -3,15 +3,27 @@ when: steps: - name: build - image: git.unkin.net/unkin/almalinux9-gobuilder:20260606 + image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/gobuilder:0.1.2-alma9 commands: - make build VERSION=${CI_COMMIT_TAG} + environment: + GOCACHE_S3_BUCKET: gocache + GOCACHE_S3_REGION: us-east-1 + GOCACHE_S3_ENDPOINT_URL: https://s3.ceph.unkin.net + GOCACHE_S3_PATH_STYLE: "true" + GOCACHE_KEY_PREFIX: ci-passv + GOCACHE_METRICS: "true" + GOCACHEPROG: go-cache-plugin --cache-dir=/tmp/gocache + AWS_ACCESS_KEY_ID: + from_secret: GOCACHE_AWS_ACCESS_KEY_ID + AWS_SECRET_ACCESS_KEY: + from_secret: GOCACHE_AWS_SECRET_ACCESS_KEY backend_options: kubernetes: serviceAccountName: default resources: - requests: {memory: 512Mi, cpu: 1} - limits: {memory: 2Gi, cpu: 2} + requests: {memory: 1Gi, cpu: 1} + limits: {memory: 3Gi, cpu: 2} - name: package image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest diff --git a/.woodpecker/test.yml b/.woodpecker/test.yml index 24304c5..52c2d52 100644 --- a/.woodpecker/test.yml +++ b/.woodpecker/test.yml @@ -3,23 +3,47 @@ when: steps: - name: lint - image: golang:1.25 + image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/gobuilder:0.1.2-alma9 commands: - make lint + environment: + GOCACHE_S3_BUCKET: gocache + GOCACHE_S3_REGION: us-east-1 + GOCACHE_S3_ENDPOINT_URL: https://s3.ceph.unkin.net + GOCACHE_S3_PATH_STYLE: "true" + GOCACHE_KEY_PREFIX: ci-passv + GOCACHE_METRICS: "true" + GOCACHEPROG: go-cache-plugin --cache-dir=/tmp/gocache + AWS_ACCESS_KEY_ID: + from_secret: GOCACHE_AWS_ACCESS_KEY_ID + AWS_SECRET_ACCESS_KEY: + from_secret: GOCACHE_AWS_SECRET_ACCESS_KEY backend_options: kubernetes: serviceAccountName: default resources: - requests: {memory: 512Mi, cpu: 1} - limits: {memory: 2Gi, cpu: 2} + requests: {memory: 1Gi, cpu: 1} + limits: {memory: 3Gi, cpu: 2} - name: test - image: golang:1.25 + image: artifactapi.k8s.syd1.au.unkin.net/docker-internal/gobuilder:0.1.2-alma9 commands: - make test + environment: + GOCACHE_S3_BUCKET: gocache + GOCACHE_S3_REGION: us-east-1 + GOCACHE_S3_ENDPOINT_URL: https://s3.ceph.unkin.net + GOCACHE_S3_PATH_STYLE: "true" + GOCACHE_KEY_PREFIX: ci-passv + GOCACHE_METRICS: "true" + GOCACHEPROG: go-cache-plugin --cache-dir=/tmp/gocache + AWS_ACCESS_KEY_ID: + from_secret: GOCACHE_AWS_ACCESS_KEY_ID + AWS_SECRET_ACCESS_KEY: + from_secret: GOCACHE_AWS_SECRET_ACCESS_KEY backend_options: kubernetes: serviceAccountName: default resources: - requests: {memory: 512Mi, cpu: 1} - limits: {memory: 2Gi, cpu: 2} + requests: {memory: 1Gi, cpu: 1} + limits: {memory: 3Gi, cpu: 2}