chore(capms): matrix builds

Author: vknabel

.github/workflows/docker.yaml

@@ -48,6 +48,15 @@ jobs:
             version: 12
           - name: ubuntu
             version: 24.04
+          - name: capms
+            version: 1.35.2
+            apt_branch: "1.35"
+          - name: capms
+            version: 1.34.5
+            apt_branch: "1.34"
+          - name: capms
+            version: 1.33.9
+            apt_branch: "1.33"
 
     steps:
       - name: Checkout
@@ -173,8 +182,8 @@ jobs:
         shell: bash
         run: ./prepare.sh capms-ubuntu
         env:
-          SEMVER_MAJOR_MINOR: 1.34.5
-        if: ${{ matrix.os.name == 'ubuntu' }}
+          SEMVER_MAJOR_MINOR: ${{ matrix.os.version }}
+        if: ${{ matrix.os.name == 'capms' }}
 
       - name: Build docker image for capms
         uses: docker/bake-action@v6
@@ -185,12 +194,12 @@ jobs:
           no-cache: true
           set: _common.output+=type=registry
         env:
-          KUBE_VERSION: 1.34.5
-          KUBE_APT_BRANCH: v1.34
+          KUBE_VERSION: ${{ matrix.os.version }}
+          KUBE_APT_BRANCH: ${{ matrix.os.apt_branch }}
           OS_NAME: capms-ubuntu
-          SEMVER_MAJOR_MINOR: 1.34.5
+          SEMVER_MAJOR_MINOR: ${{ matrix.os.version }}
           SEMVER_PATCH: ${{ env.SEMVER_PATCH }}
-        if: ${{ matrix.os.name == 'ubuntu' }}
+        if: ${{ matrix.os.name == 'capms' }}
 
       - name: Test and export docker image for capms
         run: |
@@ -199,9 +208,9 @@ jobs:
         env:
           IMG_PKG_COMMAND: dpkg -l
           OS_NAME: capms-ubuntu
-          SEMVER_MAJOR_MINOR: 1.34.5
+          SEMVER_MAJOR_MINOR: ${{ matrix.os.version }}
           SEMVER_PATCH: ${{ env.SEMVER_PATCH }}
-        if: ${{ matrix.os.name == 'ubuntu' }}
+        if: ${{ matrix.os.name == 'capms' }}
 
       - name: Prepare build environment
         shell: bash

Makefile

@@ -66,12 +66,16 @@ ubuntu: test binary
 	OS_NAME=ubuntu OUTPUT_FOLDER="" SEMVER_MAJOR_MINOR=24.04 ./test.sh
 
 .PHONY: capms
-capms: test ubuntu
-	KUBE_VERSION=1.34.5 \
-	KUBE_APT_BRANCH=v1.34 \
-	SEMVER_MAJOR_MINOR=1.34.5 \
+capms:
+	$(MAKE) capms-v1.34.5
+
+.PHONY: capms-v%
+capms-v%: test ubuntu
+	KUBE_VERSION=$@ \
+	KUBE_APT_BRANCH=v$(shell echo $@ | cut -d . -f1-2) \
+	SEMVER_MAJOR_MINOR=$@ \
 	docker buildx bake --no-cache ubuntu-capms
-	OS_NAME=capms-ubuntu OUTPUT_FOLDER="" SEMVER_MAJOR_MINOR=1.34.5 ./test.sh
+	OS_NAME=capms-ubuntu OUTPUT_FOLDER="" SEMVER_MAJOR_MINOR=$@ ./test.sh
 
 .PHONY: firewall
 firewall: test binary