kata-containers(-cc): Update to 3.2.0.azl4 (#11205)

Signed-off-by: Saul Paredes <saulparedes@microsoft.com>
Co-authored-by: Saul Paredes <saulparedes@microsoft.com>
Co-authored-by: CBL-Mariner Servicing Account <cblmargh@microsoft.com>

Author: 3 people

SPECS/kata-containers-cc/kata-containers-cc.signatures.json

@@ -1,6 +1,6 @@
 {
   "Signatures": {
-    "kata-containers-3.2.0.azl3-cargo.tar.gz": "38dd5d2cf22edb75169809978d6578a23d5177590a25dbd97071ff06378ea77d",
-    "kata-containers-3.2.0.azl3.tar.gz": "078b3b864c7d83a3fddd2b02dc843aba627d97ef1ba2b2ba7dea65efd459e5b1"
+    "kata-containers-3.2.0.azl4-cargo.tar.gz": "2a242deedddbd01b50b56d9f6d02ffd3f40cb2e91221fda4f4b4791d98404f96",
+    "kata-containers-3.2.0.azl4.tar.gz": "397749898ae5963b9d88092e1bd3aacfb2d9bdeb35373be079879fc92f7ffd71"
   }
-}
+}

SPECS/kata-containers-cc/kata-containers-cc.spec

@@ -2,7 +2,7 @@
 %define sourceName kata-containers
 
 Name:         kata-containers-cc
-Version:      3.2.0.azl3
+Version:      3.2.0.azl4
 Release:      1%{?dist}
 Summary:      Kata Confidential Containers package developed for Confidential Containers on AKS
 License:      ASL 2.0
@@ -14,6 +14,7 @@ Source1:      %{sourceName}-%{version}-cargo.tar.gz
 
 ExclusiveArch: x86_64
 
+BuildRequires:  azurelinux-release
 BuildRequires:  golang
 BuildRequires:  protobuf-compiler
 BuildRequires:  rust
@@ -50,7 +51,7 @@ popd
 
 %build
 pushd %{_builddir}/%{sourceName}-%{version}/tools/osbuilder/node-builder/azure-linux
-OS_VERSION=3.0 %make_build package-confpods
+%make_build package-confpods
 popd
 
 %define kata_path     /opt/confidential-containers
@@ -136,6 +137,7 @@ fi
 %{tools_pkg}/tools/osbuilder/node-builder/azure-linux/clean.sh
 %{tools_pkg}/tools/osbuilder/node-builder/azure-linux/common.sh
 %{tools_pkg}/tools/osbuilder/node-builder/azure-linux/uvm_build.sh
+%{tools_pkg}/tools/osbuilder/node-builder/azure-linux/uvm_install.sh
 
 %dir %{tools_pkg}/tools/osbuilder/node-builder/azure-linux/agent-install
 %dir %{tools_pkg}/tools/osbuilder/node-builder/azure-linux/agent-install/usr
@@ -148,6 +150,9 @@ fi
 %{tools_pkg}/tools/osbuilder/node-builder/azure-linux/agent-install/usr/lib/systemd/system/kata-agent.service
 
 %changelog
+* Wed Jan 22 2025 Saul Paredes <saulparedes@microsoft.com> - 3.2.0.azl4-1
+- Upgrade to 3.2.0.azl4 release
+
 * Fri Sep 20 2024 Manuel Huber <mahuber@microsoft.com> - 3.2.0.azl3-1
 - Upgrade to 3.2.0.azl3 release, refactor build instructions
 

SPECS/kata-containers/kata-containers.signatures.json

@@ -1,6 +1,6 @@
 {
   "Signatures": {
-    "kata-containers-3.2.0.azl3-cargo.tar.gz": "38dd5d2cf22edb75169809978d6578a23d5177590a25dbd97071ff06378ea77d",
-    "kata-containers-3.2.0.azl3.tar.gz": "078b3b864c7d83a3fddd2b02dc843aba627d97ef1ba2b2ba7dea65efd459e5b1"
+    "kata-containers-3.2.0.azl4-cargo.tar.gz": "2a242deedddbd01b50b56d9f6d02ffd3f40cb2e91221fda4f4b4791d98404f96",
+    "kata-containers-3.2.0.azl4.tar.gz": "397749898ae5963b9d88092e1bd3aacfb2d9bdeb35373be079879fc92f7ffd71"
   }
-}
+}

SPECS/kata-containers/kata-containers.spec

@@ -1,8 +1,8 @@
 %global debug_package %{nil}
 
 Name:           kata-containers
-Version:        3.2.0.azl3
-Release:        2%{?dist}
+Version:        3.2.0.azl4
+Release:        1%{?dist}
 Summary:        Kata Containers package developed for Pod Sandboxing on AKS
 License:        ASL 2.0
 URL:            https://github.com/microsoft/kata-containers
@@ -13,6 +13,7 @@ Source1:        %{name}-%{version}-cargo.tar.gz
 
 ExclusiveArch: x86_64
 
+BuildRequires:  azurelinux-release
 BuildRequires:  golang
 BuildRequires:  protobuf-compiler
 BuildRequires:  rust
@@ -45,7 +46,7 @@ popd
 
 %build
 pushd %{_builddir}/%{name}-%{version}/tools/osbuilder/node-builder/azure-linux
-OS_VERSION=3.0 %make_build package
+%make_build package
 popd
 
 %define kata_path     /opt/kata-containers
@@ -98,6 +99,7 @@ popd
 %{tools_pkg}/tools/osbuilder/node-builder/azure-linux/clean.sh
 %{tools_pkg}/tools/osbuilder/node-builder/azure-linux/common.sh
 %{tools_pkg}/tools/osbuilder/node-builder/azure-linux/uvm_build.sh
+%{tools_pkg}/tools/osbuilder/node-builder/azure-linux/uvm_install.sh
 
 %dir %{tools_pkg}/tools/osbuilder/node-builder/azure-linux/agent-install
 %dir %{tools_pkg}/tools/osbuilder/node-builder/azure-linux/agent-install/usr
@@ -110,6 +112,9 @@ popd
 %{tools_pkg}/tools/osbuilder/node-builder/azure-linux/agent-install/usr/lib/systemd/system/kata-agent.service
 
 %changelog
+* Wed Jan 22 2025 Saul Paredes <saulparedes@microsoft.com> - 3.2.0.azl4-1
+- Upgrade to 3.2.0.azl4 release
+
 * Thu Oct 25 2024 Saul Paredes <saulparedes@microsoft.com> - 3.2.0.azl3-2
 - Only build for x86_64
 

cgmanifest.json

@@ -8091,8 +8091,8 @@
         "type": "other",
         "other": {
           "name": "kata-containers",
-          "version": "3.2.0.azl3",
-          "downloadUrl": "https://github.com/microsoft/kata-containers/archive/refs/tags/3.2.0.azl3.tar.gz"
+          "version": "3.2.0.azl4",
+          "downloadUrl": "https://github.com/microsoft/kata-containers/archive/refs/tags/3.2.0.azl4.tar.gz"
         }
       }
     },
@@ -8101,8 +8101,8 @@
         "type": "other",
         "other": {
           "name": "kata-containers-cc",
-          "version": "3.2.0.azl3",
-          "downloadUrl": "https://github.com/microsoft/kata-containers/archive/refs/tags/3.2.0.azl3.tar.gz"
+          "version": "3.2.0.azl4",
+          "downloadUrl": "https://github.com/microsoft/kata-containers/archive/refs/tags/3.2.0.azl4.tar.gz"
         }
       }
     },