From 4707883b4003645ecfd760a28f437ca1e54c79cf Mon Sep 17 00:00:00 2001
From: Dan Mihai <dmihai@microsoft.com>
Date: Fri, 10 Jan 2025 20:07:41 +0000
Subject: [PATCH] image: bump mariner guest version to 3.0

Use Mariner 3.0 (a.k.a., Azure Linux 3.0) as the Guest CI image.

Signed-off-by: Dan Mihai <dmihai@microsoft.com>
---
 tools/osbuilder/rootfs-builder/cbl-mariner/Dockerfile.in | 2 +-
 tools/osbuilder/rootfs-builder/cbl-mariner/config.sh     | 2 +-
 versions.yaml                                            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/osbuilder/rootfs-builder/cbl-mariner/Dockerfile.in b/tools/osbuilder/rootfs-builder/cbl-mariner/Dockerfile.in
index 5cb4cef64d..59f8bcc973 100644
--- a/tools/osbuilder/rootfs-builder/cbl-mariner/Dockerfile.in
+++ b/tools/osbuilder/rootfs-builder/cbl-mariner/Dockerfile.in
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 ARG IMAGE_REGISTRY=mcr.microsoft.com
-FROM ${IMAGE_REGISTRY}/cbl-mariner/base/core:@OS_VERSION@
+FROM ${IMAGE_REGISTRY}/azurelinux/base/core:@OS_VERSION@
 
 RUN tdnf -y install \
     ca-certificates \
diff --git a/tools/osbuilder/rootfs-builder/cbl-mariner/config.sh b/tools/osbuilder/rootfs-builder/cbl-mariner/config.sh
index 9760a50e3e..f032867d0c 100644
--- a/tools/osbuilder/rootfs-builder/cbl-mariner/config.sh
+++ b/tools/osbuilder/rootfs-builder/cbl-mariner/config.sh
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 OS_NAME=cbl-mariner
-OS_VERSION=${OS_VERSION:-2.0}
+OS_VERSION=${OS_VERSION:-3.0}
 LIBC="gnu"
 PACKAGES="kata-packages-uvm"
 [ "$AGENT_INIT" = no ] && PACKAGES+=" systemd"
diff --git a/versions.yaml b/versions.yaml
index 74232e7794..638a06cc02 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -141,7 +141,7 @@ assets:
           version: *default-image-version
         mariner:
           name: "cbl-mariner"
-          version: "2.0"
+          version: "3.0"
         nvidia-gpu:
           name: *default-image-name
           version: "jammy"