diff --git a/src/tools/genpolicy/rules.rego b/src/tools/genpolicy/rules.rego index 6ddfa0714273..f123d661d813 100644 --- a/src/tools/genpolicy/rules.rego +++ b/src/tools/genpolicy/rules.rego @@ -66,7 +66,8 @@ CreateContainerRequest { p_oci := p_container.OCI print("CreateContainerRequest: p Version =", p_oci.Version, "i Version =", i_oci.Version) - p_oci.Version == i_oci.Version + # TODO: Reenable when the Mariner host is reinstated, see #9593. + # p_oci.Version == i_oci.Version print("CreateContainerRequest: p Readonly =", p_oci.Root.Readonly, "i Readonly =", i_oci.Root.Readonly) p_oci.Root.Readonly == i_oci.Root.Readonly diff --git a/tests/gha-run-k8s-common.sh b/tests/gha-run-k8s-common.sh index 6ce754bc1392..99711744855e 100644 --- a/tests/gha-run-k8s-common.sh +++ b/tests/gha-run-k8s-common.sh @@ -96,8 +96,7 @@ function create_cluster() { -n "$(_print_cluster_name ${test_type})" \ -s "$(_print_instance_type)" \ --node-count 1 \ - --generate-ssh-keys \ - $([ "${KATA_HOST_OS}" = "cbl-mariner" ] && echo "--os-sku AzureLinux --workload-runtime KataMshvVmIsolation") + --generate-ssh-keys } function install_bats() { diff --git a/tests/integration/kubernetes/setup.sh b/tests/integration/kubernetes/setup.sh index 94eaf83a2a9b..41538537f52b 100755 --- a/tests/integration/kubernetes/setup.sh +++ b/tests/integration/kubernetes/setup.sh @@ -97,7 +97,6 @@ add_cbl_mariner_kernel_initrd_annotations() { for K8S_TEST_YAML in runtimeclass_workloads_work/*.yaml 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}" done fi