From 63c1f81c23f63f1a3a1e523e4993288a362a1700 Mon Sep 17 00:00:00 2001
From: Dan Mihai <dmihai@microsoft.com>
Date: Fri, 23 Aug 2024 22:36:22 +0000
Subject: [PATCH] local-build: add rootfs-image-mariner

Kata CI will start testing the new rootfs-image-mariner instead of the
older rootfs-initrd-mariner image.

The "official" AKS images are moving from a rootfs-initrd-mariner
format to the rootfs-image-mariner format. Making the same change in
Kata CI is useful to keep this testing in sync with the AKS settings.

Signed-off-by: Dan Mihai <dmihai@microsoft.com>
---
 .github/workflows/build-kata-static-tarball-amd64.yaml    | 1 +
 tools/packaging/kata-deploy/local-build/Makefile          | 4 ++++
 .../kata-deploy/local-build/kata-deploy-binaries.sh       | 8 ++++++++
 versions.yaml                                             | 3 +++
 4 files changed, 16 insertions(+)

diff --git a/.github/workflows/build-kata-static-tarball-amd64.yaml b/.github/workflows/build-kata-static-tarball-amd64.yaml
index 7b058923b9..bbabe8ff0e 100644
--- 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
index 778183bf6e..2aed171ee4 100644
--- 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
index 1b8f880093..e90a91c95f 100755
--- 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
index 9f7ca9eedb..195702207e 100644
--- 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"