Merge master

Author: majst01

.github/workflows/docker.yaml

@@ -16,8 +16,30 @@ env:
   ACTIONS_ALLOW_UNSECURE_COMMANDS: true
 
 jobs:
-  debian-ubuntu:
+  test-go:
+    name: Run go test on GitHub runner
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Go 1.25
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.25.x'
+          cache: false
+
+      - name: Set up Docker
+        uses: docker/setup-docker-action@v4
+
+      - name: Run tests
+        run: make test
+
+
+  debian_ubuntu:
     name: Build Debian and Ubuntu based OS images
+    needs: test-go
     runs-on: self-hosted
 
     strategy:
@@ -66,7 +88,9 @@ jobs:
           args: --build-tags integration --timeout=3m
 
       - name: build install
-        run: make
+        run: |
+          make clean
+          make binary
 
       - name: Prepare build environment
         shell: bash
@@ -216,7 +240,9 @@ jobs:
 
   almalinux:
     name: Build Almalinux based OS image
+    needs: test-go
     runs-on: self-hosted
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -250,7 +276,9 @@ jobs:
           [ "${GITHUB_EVENT_NAME}" == 'push' ] && echo "SEMVER_PATCH=" >> $GITHUB_ENV || true
 
       - name: build install
-        run: make
+        run: |
+          make clean
+          make binary
 
       - name: Prepare build environment
         shell: bash

.github/workflows/release.yaml

@@ -38,47 +38,21 @@ jobs:
           go-version: '1.25.x'
           cache: false
 
-      - run: |
-          # copy supported images (entire stable folder cannot be copied as a whole because it contains obsolete images as well)
-          gsutil -m cp -r gs://$GCS_BUCKET/metal-os/stable/almalinux/9 gs://$GCS_BUCKET/metal-os/${GITHUB_REF##*/}/almalinux/9
-          gsutil -m cp -r gs://$GCS_BUCKET/metal-os/stable/debian/13 gs://$GCS_BUCKET/metal-os/${GITHUB_REF##*/}/debian/13
-          gsutil -m cp -r gs://$GCS_BUCKET/metal-os/stable/debian-nvidia/13 gs://$GCS_BUCKET/metal-os/${GITHUB_REF##*/}/debian-nvidia/13
-          gsutil -m cp -r gs://$GCS_BUCKET/metal-os/stable/firewall/3.0-ubuntu gs://$GCS_BUCKET/metal-os/${GITHUB_REF##*/}/firewall/3.0-ubuntu
-          gsutil -m cp -r gs://$GCS_BUCKET/metal-os/stable/ubuntu/24.04 gs://$GCS_BUCKET/metal-os/${GITHUB_REF##*/}/ubuntu/24.04
-          gsutil -m cp -r gs://$GCS_BUCKET/metal-os/stable/capms-ubuntu/ gs://$GCS_BUCKET/metal-os/${GITHUB_REF##*/}/capms-ubuntu
-
-          docker pull ghcr.io/metal-stack/debian:13-stable
-          docker tag ghcr.io/metal-stack/debian:13-stable ghcr.io/metal-stack/debian:13
-          docker tag ghcr.io/metal-stack/debian:13-stable ghcr.io/metal-stack/debian:latest
-          docker push ghcr.io/metal-stack/debian:13
-
-          docker pull ghcr.io/metal-stack/debian-nvidia:13-stable
-          docker tag ghcr.io/metal-stack/debian-nvidia:13-stable ghcr.io/metal-stack/debian-nvidia:13
-          docker tag ghcr.io/metal-stack/debian-nvidia:13-stable ghcr.io/metal-stack/debian-nvidia:latest
-          docker push ghcr.io/metal-stack/debian-nvidia:13
-
-          docker pull ghcr.io/metal-stack/ubuntu:24.04-stable
-          docker tag ghcr.io/metal-stack/ubuntu:24.04-stable ghcr.io/metal-stack/ubuntu:24.04
-          docker tag ghcr.io/metal-stack/ubuntu:24.04-stable ghcr.io/metal-stack/ubuntu:latest
-          docker push ghcr.io/metal-stack/ubuntu:24.04
-
-          # TODO: needs to be solved for capi images in order not to have to enter every release here
-          # docker pull ghcr.io/metal-stack/capms-ubuntu:1.32.9-stable
-          # docker tag ghcr.io/metal-stack/capms-ubuntu:1.32.9-stable ghcr.io/metal-stack/capms-ubuntu:1.32.9
-          # docker tag ghcr.io/metal-stack/capms-ubuntu:1.32.9-stable ghcr.io/metal-stack/capms-ubuntu:latest
-          # docker push ghcr.io/metal-stack/capms-ubuntu:1.32.9
-
-          docker pull ghcr.io/metal-stack/almalinux:9-stable
-          docker tag ghcr.io/metal-stack/almalinux:9-stable ghcr.io/metal-stack/almalinux:9
-          docker tag ghcr.io/metal-stack/almalinux:9-stable ghcr.io/metal-stack/almalinux:latest
-          docker push ghcr.io/metal-stack/almalinux:9
-
-          docker pull ghcr.io/metal-stack/firewall:3.0-ubuntu-stable
-          docker tag ghcr.io/metal-stack/firewall:3.0-ubuntu-stable ghcr.io/metal-stack/firewall:3.0-ubuntu
-          docker tag ghcr.io/metal-stack/firewall:3.0-ubuntu-stable ghcr.io/metal-stack/firewall:latest
-          docker push ghcr.io/metal-stack/firewall:3.0-ubuntu
-
-          PREFIX=metal-os/${GITHUB_REF##*/} go run ./cmd/tools/generate-table > downloads.md
+      - run: go run ./cmd/tools/handle-release
+        env:
+          FILENAME: downloads.md
+          GCS_BUCKET: ${{ secrets.GCS_BUCKET }}
+          TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          REF_NAME: ${{ github.ref_name }}
+          DISTRO_VERSIONS: |
+            [
+              "ubuntu/24.04",
+              "capms-ubuntu/1.32.9",
+              "firewall/3.0-ubuntu",
+              "debian/13",
+              "debian-nvidia/13",
+              "almalinux/9",
+            ]
 
       - name: Update release body
         id: update_release

.gitignore

@@ -11,5 +11,6 @@ os-kernel
 disk.raw
 rootfs
 initramfs
+downloads.md
 
 !capms/**/bin

Makefile

@@ -12,7 +12,7 @@ LINKMODE := -extldflags=-static \
 		 -X 'github.com/metal-stack/v.BuildDate=$(BUILDDATE)'
 
 
-all: clean binary
+all: clean test binary
 
 .PHONY: clean
 clean:
@@ -32,7 +32,7 @@ clean:
 	rm -rf bin
 
 .PHONY: binary
-binary: test
+binary:
 	GGO_ENABLED=0 \
 		go build \
 			-trimpath \
@@ -49,7 +49,7 @@ test:
 	GO_ENV=testing go test -race -cover ./...
 
 .PHONY: debian
-debian: binary
+debian: test binary
 	mkdir -p "images/debian/13"
 	OS_NAME=debian OUTPUT_FOLDER="" SEMVER_MAJOR_MINOR=13 docker buildx bake --no-cache debian
 	OS_NAME=debian OUTPUT_FOLDER="" CIS_VERSION=v4.1-4 SEMVER_MAJOR_MINOR=13 ./test.sh
@@ -60,27 +60,27 @@ nvidia:
 	OS_NAME=nvidia OUTPUT_FOLDER="" SEMVER_MAJOR_MINOR=13 docker buildx bake --no-cache debian-nvidia
 
 .PHONY: ubuntu
-ubuntu: binary
+ubuntu: test binary
 	mkdir -p "images/ubuntu/24.04"
 	OS_NAME=ubuntu OUTPUT_FOLDER="" SEMVER_MAJOR_MINOR=24.04 docker buildx bake --no-cache ubuntu
 	OS_NAME=ubuntu OUTPUT_FOLDER="" SEMVER_MAJOR_MINOR=24.04 ./test.sh
 
 .PHONY: capms
-capms: ubuntu
+capms: test ubuntu
 	KUBE_VERSION=1.32.9 \
 	KUBE_APT_BRANCH=v1.32 \
 	SEMVER_MAJOR_MINOR=1.32.9 \
 	docker buildx bake --no-cache ubuntu-capms
 	OS_NAME=capms-ubuntu OUTPUT_FOLDER="" SEMVER_MAJOR_MINOR=1.32.9 ./test.sh
 
 .PHONY: firewall
-firewall: binary
+firewall: test binary
 	mkdir -p "images/firewall/3.0-ubuntu"
 	OS_NAME=firewall OUTPUT_FOLDER="" SEMVER_MAJOR_MINOR=3.0-ubuntu docker buildx bake --no-cache ubuntu-firewall
 	OS_NAME=firewall OUTPUT_FOLDER="" SEMVER_MAJOR_MINOR=3.0-ubuntu ./test.sh
 
 .PHONY: almalinux
-almalinux: binary
+almalinux: test binary
 	mkdir -p "images/almalinux/9"
 	OS_NAME=almalinux OUTPUT_FOLDER="" SEMVER_MAJOR_MINOR=9 docker buildx bake --no-cache almalinux
 	OS_NAME=almalinux OUTPUT_FOLDER="" SEMVER_MAJOR_MINOR=9 ./test.sh

cmd/tools/generate-table/main.go

@@ -0,0 +1,10 @@
+# handle-release
+
+## Run locally
+
+```bash
+FILENAME=downloads.md \
+REF_NAME=$(git rev-parse --abbrev-ref HEAD) \
+DISTRO_VERSIONS=$'["capms-ubuntu/1.32.9", "ubuntu/24.04"]' \
+go run ./cmd/tools/handle-release --dry-run
+```