diff --git a/bundle/manifests/cc-operator.clusterserviceversion.yaml b/bundle/manifests/cc-operator.clusterserviceversion.yaml index 22100669..b4a13be7 100644 --- a/bundle/manifests/cc-operator.clusterserviceversion.yaml +++ b/bundle/manifests/cc-operator.clusterserviceversion.yaml @@ -214,6 +214,7 @@ metadata: "kata-clh-tdx-eaa-kbc" "kata-qemu", "kata-qemu-sev", + "kata-qemu-se", "kata-qemu-tdx", "kata-qemu-tdx-eaa-kbc", "kata-remote" diff --git a/config/samples/ccruntime/default/kustomization.yaml b/config/samples/ccruntime/default/kustomization.yaml index caf5a55f..6c67db4b 100644 --- a/config/samples/ccruntime/default/kustomization.yaml +++ b/config/samples/ccruntime/default/kustomization.yaml @@ -10,8 +10,8 @@ images: - name: quay.io/confidential-containers/container-engine-for-cc-payload newTag: 98a790e8abdcc06c4b629b290ebaa217bf82e305 - name: quay.io/confidential-containers/runtime-payload - newName: quay.io/confidential-containers/runtime-payload - newTag: kata-containers-338e18e4fd46756643cb1a307b6a20f24c350ad4 + newName: quay.io/confidential-containers/runtime-payload-ci + newTag: kata-containers-128f0282e11fb33f648c0ecf1d75a40f13985e01 patches: - patch: |- diff --git a/config/samples/ccruntime/s390x/kustomization.yaml b/config/samples/ccruntime/s390x/kustomization.yaml index 7a98e921..cfc0bc58 100644 --- a/config/samples/ccruntime/s390x/kustomization.yaml +++ b/config/samples/ccruntime/s390x/kustomization.yaml @@ -10,6 +10,6 @@ patches: - patch: |- - op: replace path: /spec/config/runtimeClassNames - value: ["kata", "kata-qemu"] + value: ["kata", "kata-qemu", "kata-qemu-se"] target: kind: CcRuntime diff --git a/tests/e2e/tests_runner.sh b/tests/e2e/tests_runner.sh index 6d2cd9d1..cd80392b 100755 --- a/tests/e2e/tests_runner.sh +++ b/tests/e2e/tests_runner.sh @@ -93,6 +93,21 @@ run_non_tee_tests() { } +run_kata_qemu_se_tests() { + local aa_kbc="${1:-"offline_fs_kbc"}" + export AA_KBC="${aa_kbc}" + + local runtime_config_file="/opt/confidential-containers/share/defaults/kata-containers/" + runtime_config_file+="configuration-qemu-se.toml" + sed -i "s#kata-runtime kata-env#kata-runtime --config $runtime_config_file kata-env#g" \ + ../../../lib/common.bash + + bats \ + "agent_image.bats" \ + "agent_image_encrypted.bats" \ + "${script_dir}/operator_tests.bats" +} + # Tests for CC with QEMU on SEV HW run_kata_qemu_sev_tests() { bats "sev.bats" @@ -122,6 +137,10 @@ main() { echo "INFO: Running non-TEE tests for $runtimeclass using OfflineFS KBC" run_non_tee_tests "$runtimeclass" ;; + kata-qemu-se) + echo "INFO: Running TEE tests for $runtimeclass using OfflineFS KBC" + run_kata_qemu_se_tests + ;; kata-qemu-tdx) echo "INFO: Running non-TEE tests for $runtimeclass using CC KBC" run_non_tee_tests "$runtimeclass" "cc_kbc"