Merge pull request kata-containers#10390 from microsoft/danmihai1/new…

…-rootfs-image-mariner local-build: add ability to build rootfs-image-mariner
ChengyuZhu6 · Oct 8, 2024 · 80196c0 · 80196c0
2 parents 083b2f2 + 63c1f81
commit 80196c0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/.github/workflows/build-kata-static-tarball-amd64.yaml b/.github/workflows/build-kata-static-tarball-amd64.yaml
@@ -50,6 +50,7 @@ jobs:
           - stratovirt
           - rootfs-image
           - rootfs-image-confidential
+          - rootfs-image-mariner
           - rootfs-initrd
           - rootfs-initrd-confidential
           - rootfs-initrd-mariner

diff --git a/tools/packaging/kata-deploy/local-build/Makefile b/tools/packaging/kata-deploy/local-build/Makefile
@@ -35,6 +35,7 @@ BASE_TARBALLS = serial-targets \
 	virtiofsd-tarball
 BASE_SERIAL_TARBALLS = rootfs-image-tarball \
 	rootfs-image-confidential-tarball \
+	rootfs-image-mariner-tarball \
 	rootfs-initrd-confidential-tarball \
 	rootfs-initrd-mariner-tarball \
 	rootfs-initrd-tarball \
@@ -149,6 +150,9 @@ rootfs-image-tarball: agent-tarball
 rootfs-image-confidential-tarball: agent-tarball pause-image-tarball coco-guest-components-tarball kernel-confidential-tarball
 	${MAKE} $@-build
 
+rootfs-image-mariner-tarball: agent-tarball
+	${MAKE} $@-build
+
 rootfs-initrd-mariner-tarball: agent-tarball
 	${MAKE} $@-build
 

diff --git a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
@@ -118,6 +118,7 @@ options:
 	stratovirt
 	rootfs-image
 	rootfs-image-confidential
+	rootfs-image-mariner
 	rootfs-initrd
 	rootfs-initrd-confidential
 	rootfs-initrd-mariner
@@ -342,6 +343,11 @@ install_image_confidential() {
 	install_image "confidential"
 }
 
+#Install cbl-mariner guest image
+install_image_mariner() {
+	install_image "mariner"
+}
+
 #Install guest initrd
 install_initrd() {
 	local variant="${1:-}"
@@ -1086,6 +1092,8 @@ handle_build() {
 
 	rootfs-image-confidential) install_image_confidential ;;
 
+	rootfs-image-mariner) install_image_mariner ;;
+
 	rootfs-initrd) install_initrd ;;
 
 	rootfs-initrd-confidential) install_initrd_confidential ;;

diff --git a/versions.yaml b/versions.yaml
@@ -139,6 +139,9 @@ assets:
         confidential:
           name: *default-image-name
           version: *default-image-version
+        mariner:
+          name: "cbl-mariner"
+          version: "2.0"
         nvidia-gpu:
           name: *default-image-name
           version: "jammy"