github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-24 22:43:05 +00:00
Code Issues Projects Releases Wiki Activity

tools: Use a consistent target name when building mariner initrd

Browse Source 
Currently a mixture of cbl-mariner and mariner is used when creating the
mariner initrd. The kata-static tarball has mariner in the name, but the
jenkins url uses cbl-mariner. This breaks cache usage.

Use mariner as the target name throughout the build, so that caching works.

Fixes: #7292
Signed-off-by: Jeremi Piotrowski <jpiotrowski@microsoft.com>
This commit is contained in:
Jeremi Piotrowski 2023-07-11 14:16:48 +02:00
parent aa484dc0e3
commit 307cfc8f7a
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/kubernetes/setup.sh
View File

@ -23,7 +23,7 @@ set_kernel_path() {
set_initrd_path() { set_initrd_path() {
if [[ "${KATA_HOST_OS}" = "cbl-mariner" ]]; then if [[ "${KATA_HOST_OS}" = "cbl-mariner" ]]; then
initrd_path="/opt/kata/share/kata-containers/kata-containers-initrd-cbl-mariner.img" initrd_path="/opt/kata/share/kata-containers/kata-containers-initrd-mariner.img"
find ${kubernetes_dir}/runtimeclass_workloads/*.yaml -exec yq write -i {} 'metadata.annotations[io.katacontainers.config.hypervisor.initrd]' "${initrd_path}" \; find ${kubernetes_dir}/runtimeclass_workloads/*.yaml -exec yq write -i {} 'metadata.annotations[io.katacontainers.config.hypervisor.initrd]' "${initrd_path}" \;
fi fi
} }

2
tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
View File

@ -232,7 +232,7 @@ install_initrd() {
#Install Mariner guest initrd #Install Mariner guest initrd
install_initrd_mariner() { install_initrd_mariner() {
install_initrd "cbl-mariner" install_initrd "mariner"
} }
#Install guest initrd for sev #Install guest initrd for sev

2
versions.yaml
View File

@ -159,7 +159,7 @@ assets:
x86_64: x86_64:
name: *default-initrd-name name: *default-initrd-name
version: *default-initrd-version version: *default-initrd-version
cbl-mariner: mariner:
name: "cbl-mariner" name: "cbl-mariner"
version: "2.0" version: "2.0"
sev: sev: