github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-01 17:06:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10037 from sprt/reinstate-mariner-host

Browse Source 
ci: reinstate Mariner host and guest kernel
This commit is contained in:
Dan Mihai
2024-08-27 08:24:51 -07:00
committed by GitHub
parent f24983b3cf a3dba3e82b
commit 9f6f5dac4b
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/gha-run-k8s-common.sh
View File

@@ -96,7 +96,8 @@ function create_cluster() {
-n "$(_print_cluster_name ${test_type})" \ -n "$(_print_cluster_name ${test_type})" \
-s "$(_print_instance_type)" \ -s "$(_print_instance_type)" \
--node-count 1 \ --node-count 1 \
--generate-ssh-keys --generate-ssh-keys \
$([ "${KATA_HOST_OS}" = "cbl-mariner" ] && echo "--os-sku AzureLinux --workload-runtime KataMshvVmIsolation")
} }
function install_bats() { function install_bats() {

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

@@ -110,6 +110,7 @@ add_cbl_mariner_kernel_initrd_annotations() {
for K8S_TEST_YAML in runtimeclass_workloads_work/*.yaml for K8S_TEST_YAML in runtimeclass_workloads_work/*.yaml
do do
add_annotations_to_yaml "${K8S_TEST_YAML}" "${mariner_annotation_kernel}" "${mariner_kernel_path}"
add_annotations_to_yaml "${K8S_TEST_YAML}" "${mariner_annotation_initrd}" "${mariner_initrd_path}" add_annotations_to_yaml "${K8S_TEST_YAML}" "${mariner_annotation_initrd}" "${mariner_initrd_path}"
done done
fi fi

1
tests/integration/kubernetes/tests_common.sh
View File

@@ -159,6 +159,7 @@ adapt_common_policy_settings_for_cbl_mariner() {
info "Adapting common policy settings for CBL-Mariner" info "Adapting common policy settings for CBL-Mariner"
jq '.request_defaults.UpdateEphemeralMountsRequest = true' "${settings_dir}/genpolicy-settings.json" > temp.json && sudo mv temp.json "${settings_dir}/genpolicy-settings.json" jq '.request_defaults.UpdateEphemeralMountsRequest = true' "${settings_dir}/genpolicy-settings.json" > temp.json && sudo mv temp.json "${settings_dir}/genpolicy-settings.json"
jq '.kata_config.oci_version = "1.1.0-rc.1"' "${settings_dir}/genpolicy-settings.json" > temp.json && sudo mv temp.json "${settings_dir}/genpolicy-settings.json"
} }
# adapt common policy settings for various platforms # adapt common policy settings for various platforms