diff --git a/docs/how-to/ccv0.sh b/docs/how-to/ccv0.sh index f18739dbf7..967faa2238 100755 --- a/docs/how-to/ccv0.sh +++ b/docs/how-to/ccv0.sh @@ -51,6 +51,12 @@ export CONTAINER_ID="${CONTAINER_ID:-0123456789}" source /etc/os-release || source /usr/lib/os-release grep -Eq "\" /etc/os-release 2> /dev/null && export USE_PODMAN=true +export BATS_TEST_DIRNAME="${tests_repo_dir}/integration/containerd/confidential" +# If we've already checked out the test repo then source the confidential scripts +[ -d "${BATS_TEST_DIRNAME}" ] && source "${BATS_TEST_DIRNAME}/lib.sh" + +export RUNTIME_CONFIG_PATH=/etc/kata-containers/configuration.toml + debug_output() { if [ -n "${DEBUG}" ] then @@ -70,7 +76,7 @@ debug_function() { usage() { exit_code="$1" - cat < ${HOME}/pod-config.yaml -metadata: - name: ${crictl_sandbox_name} -EOF + local pod_config="${FIXTURES_DIR}/pod-config.yaml" - # If already exists then delete and re-create - if [ -n "$(sudo crictl pods --name ${crictl_sandbox_name} -q)" ]; then - crictl_delete_cc - fi - - local pod_id=$(sudo crictl runp -r kata ${HOME}/pod-config.yaml) - sudo crictl pods ${pod_id} + crictl_delete_cc_pod_if_exists "${crictl_sandbox_name}" + crictl_create_cc_pod "${pod_config}" + sudo crictl pods } -crictl_create_cc_container() { +call_crictl_create_cc_container() { # Create container configuration yaml based on our test copy of busybox - cat << EOF > ${HOME}/container-config.yaml -metadata: - name: kata-cc-busybox -image: - image: quay.io/kata-containers/confidential-containers:signed -command: -- top -log_path: kata-cc.0.log -EOF - - local pod_id=$(sudo crictl pods --name ${crictl_sandbox_name} -q) - local container_id=$(sudo crictl create -with-pull ${pod_id} ${HOME}/container-config.yaml ${HOME}/pod-config.yaml) - sudo crictl start ${container_id} + local pod_config="${FIXTURES_DIR}/pod-config.yaml" + local container_config="${FIXTURES_DIR}/container-config.yaml" + local pod_name=${crictl_sandbox_name} + crictl_create_cc_container ${pod_name} ${pod_config} ${container_config} sudo crictl ps -a } crictl_delete_cc() { - local pod_id=$(sudo crictl pods --name ${crictl_sandbox_name} -q) - local container_id=$(sudo crictl ps --pod ${pod_id} -q) - if [ -n "${container_id}" ]; then - sudo crictl stop ${container_id} && sudo crictl rm ${container_id} - fi - sudo crictl stopp ${pod_id} && sudo crictl rmp ${pod_id} + crictl_delete_cc_pod ${crictl_sandbox_name} } test_kata_runtime() { @@ -624,10 +592,10 @@ main() { init_kubernetes ;; crictl_create_cc_pod) - crictl_create_cc_pod + call_crictl_create_cc_pod ;; crictl_create_cc_container) - crictl_create_cc_container + call_crictl_create_cc_container ;; crictl_delete_cc) crictl_delete_cc