Skip to content

Commit 7c91e63

Browse files
committed
chore(capms): additionally build v1.33 and v1.35
1 parent 27dfc0f commit 7c91e63

File tree

3 files changed

+88
-1
lines changed

3 files changed

+88
-1
lines changed

.github/workflows/docker.yaml

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,47 @@ jobs:
169169
SEMVER_PATCH: ${{ env.SEMVER_PATCH }}
170170
if: ${{ matrix.os.name == 'ubuntu' }}
171171

172+
- name: Prepare build environment
173+
shell: bash
174+
run: ./prepare.sh capms-ubuntu
175+
env:
176+
SEMVER_MAJOR_MINOR: 1.33.9
177+
if: ${{ matrix.os.name == 'ubuntu' }}
178+
179+
- name: Build docker image for capms
180+
uses: docker/bake-action@v6
181+
with:
182+
source: .
183+
files: ./docker-bake.hcl
184+
targets: ubuntu-capms
185+
no-cache: true
186+
set: _common.output+=type=registry
187+
env:
188+
KUBE_VERSION: 1.33.9
189+
KUBE_APT_BRANCH: v1.33
190+
OS_NAME: capms-ubuntu
191+
SEMVER_MAJOR_MINOR: 1.33.9
192+
SEMVER_PATCH: ${{ env.SEMVER_PATCH }}
193+
if: ${{ matrix.os.name == 'ubuntu' }}
194+
195+
- name: Test and export docker image for capms
196+
run: |
197+
./test.sh
198+
./export.sh
199+
env:
200+
IMG_PKG_COMMAND: dpkg -l
201+
OS_NAME: capms-ubuntu
202+
SEMVER_MAJOR_MINOR: 1.33.9
203+
SEMVER_PATCH: ${{ env.SEMVER_PATCH }}
204+
if: ${{ matrix.os.name == 'ubuntu' }}
205+
206+
- name: Prepare build environment
207+
shell: bash
208+
run: ./prepare.sh debian-nvidia
209+
env:
210+
SEMVER_MAJOR_MINOR: ${{ matrix.os.version }}
211+
if: ${{ matrix.os.name == 'debian' }}
212+
172213
- name: Prepare build environment
173214
shell: bash
174215
run: ./prepare.sh capms-ubuntu
@@ -203,6 +244,40 @@ jobs:
203244
SEMVER_PATCH: ${{ env.SEMVER_PATCH }}
204245
if: ${{ matrix.os.name == 'ubuntu' }}
205246

247+
- name: Prepare build environment
248+
shell: bash
249+
run: ./prepare.sh capms-ubuntu
250+
env:
251+
SEMVER_MAJOR_MINOR: 1.35.2
252+
if: ${{ matrix.os.name == 'ubuntu' }}
253+
254+
- name: Build docker image for capms
255+
uses: docker/bake-action@v6
256+
with:
257+
source: .
258+
files: ./docker-bake.hcl
259+
targets: ubuntu-capms
260+
no-cache: true
261+
set: _common.output+=type=registry
262+
env:
263+
KUBE_VERSION: 1.35.2
264+
KUBE_APT_BRANCH: v1.35
265+
OS_NAME: capms-ubuntu
266+
SEMVER_MAJOR_MINOR: 1.35.2
267+
SEMVER_PATCH: ${{ env.SEMVER_PATCH }}
268+
if: ${{ matrix.os.name == 'ubuntu' }}
269+
270+
- name: Test and export docker image for capms
271+
run: |
272+
./test.sh
273+
./export.sh
274+
env:
275+
IMG_PKG_COMMAND: dpkg -l
276+
OS_NAME: capms-ubuntu
277+
SEMVER_MAJOR_MINOR: 1.35.2
278+
SEMVER_PATCH: ${{ env.SEMVER_PATCH }}
279+
if: ${{ matrix.os.name == 'ubuntu' }}
280+
206281
- name: Prepare build environment
207282
shell: bash
208283
run: ./prepare.sh debian-nvidia

Makefile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,24 @@ ubuntu: test binary
6767

6868
.PHONY: capms
6969
capms: test ubuntu
70+
KUBE_VERSION=1.33.9 \
71+
KUBE_APT_BRANCH=v1.33 \
72+
SEMVER_MAJOR_MINOR=1.33.9 \
73+
docker buildx bake --no-cache ubuntu-capms
74+
OS_NAME=capms-ubuntu OUTPUT_FOLDER="" SEMVER_MAJOR_MINOR=1.33.9 ./test.sh
75+
7076
KUBE_VERSION=1.34.5 \
7177
KUBE_APT_BRANCH=v1.34 \
7278
SEMVER_MAJOR_MINOR=1.34.5 \
7379
docker buildx bake --no-cache ubuntu-capms
7480
OS_NAME=capms-ubuntu OUTPUT_FOLDER="" SEMVER_MAJOR_MINOR=1.34.5 ./test.sh
7581

82+
KUBE_VERSION=1.35.2 \
83+
KUBE_APT_BRANCH=v1.35 \
84+
SEMVER_MAJOR_MINOR=1.35.2 \
85+
docker buildx bake --no-cache ubuntu-capms
86+
OS_NAME=capms-ubuntu OUTPUT_FOLDER="" SEMVER_MAJOR_MINOR=1.35.2 ./test.sh
87+
7688
.PHONY: firewall
7789
firewall: test binary
7890
mkdir -p "images/firewall/3.0-ubuntu"

cmd/tools/handle-release/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
```bash
66
FILENAME=downloads.md \
77
REF_NAME=$(git rev-parse --abbrev-ref HEAD) \
8-
DISTRO_VERSIONS=$'["capms-ubuntu/1.34.5", "ubuntu/24.04", "almalinux/9"]' \
8+
DISTRO_VERSIONS=$'["capms-ubuntu/1.33.9", "capms-ubuntu/1.34.5", "capms-ubuntu/1.35.2", "ubuntu/24.04", "almalinux/9"]' \
99
go run . --dry-run
1010
```

0 commit comments

Comments
 (0)