wip switch to USE_RUNTIME_RS

Author: Redent0r

tools/osbuilder/node-builder/azure-linux/Makefile

@@ -5,6 +5,7 @@
 BUILD_TYPE := release
 
 export SHIM_REDEPLOY_CONFIG := yes
+export USE_RUNTIME_RS := no
 
 ifeq ($(BUILD_TYPE),debug)
 	export AGENT_BUILD_TYPE := debug

tools/osbuilder/node-builder/azure-linux/common.sh

@@ -37,9 +37,7 @@ else
 	UVM_PATH_DEFAULT="${INSTALL_PATH_PREFIX}/share/kata-containers"
 	IMG_FILE_NAME="kata-containers.img"
 	SHIM_CONFIG_PATH="${INSTALL_PATH_PREFIX}/share/defaults/kata-containers"
-	SHIM_CONFIG_FILE_NAME="configuration-clh.toml"
 	SHIM_CONFIG_INST_FILE_NAME="configuration.toml"
-	SHIM_DBG_CONFIG_FILE_NAME="configuration-clh-debug.toml"
 	SHIM_DBG_CONFIG_INST_FILE_NAME="${SHIM_DBG_CONFIG_FILE_NAME}"
 	DEBUGGING_BINARIES_PATH="${INSTALL_PATH_PREFIX}/local/bin"
 	SHIM_BINARIES_PATH="${INSTALL_PATH_PREFIX}/local/bin"
@@ -48,18 +46,15 @@ else
 	SHIM_DBG_CONFIG_FILE_NAME_RUNTIME_GO="configuration-clh-debug.toml"
 	SHIM_CONFIG_FILE_NAME_RUNTIME_RS="configuration-cloud-hypervisor.toml"
 	SHIM_DBG_CONFIG_FILE_NAME_RUNTIME_RS="configuration-cloud-hypervisor-debug.toml"
-fi
 
-# Toggle the default shim implementation: runtime-go or runtime-rs
-SHIM_DEFAULT_IMPL=${SHIM_DEFAULT_IMPL:-runtime-go}
-if [ "${SHIM_DEFAULT_IMPL}" == "runtime-go" ]; then
-	SHIM_CONFIG_FILE_NAME="${SHIM_CONFIG_FILE_NAME_RUNTIME_GO}"
-	SHIM_DBG_CONFIG_FILE_NAME="${SHIM_DBG_CONFIG_FILE_NAME_RUNTIME_GO}"
-elif [ "${SHIM_DEFAULT_IMPL}" == "runtime-rs" ]; then
-	SHIM_CONFIG_FILE_NAME="${SHIM_CONFIG_FILE_NAME_RUNTIME_RS}"
-	SHIM_DBG_CONFIG_FILE_NAME="${SHIM_DBG_CONFIG_FILE_NAME_RUNTIME_RS}"
-else
-	die "SHIM_DEFAULT_IMPL: value '${SHIM_DEFAULT_IMPL}' must equal runtime-go or runtime-rs"
+	# Toggle the default shim implementation installed
+	if [ "${USE_RUNTIME_RS}" == "yes" ]; then
+		SHIM_CONFIG_FILE_NAME="${SHIM_CONFIG_FILE_NAME_RUNTIME_RS}"
+		SHIM_DBG_CONFIG_FILE_NAME="${SHIM_DBG_CONFIG_FILE_NAME_RUNTIME_RS}"
+	else # runtime-go
+		SHIM_CONFIG_FILE_NAME="${SHIM_CONFIG_FILE_NAME_RUNTIME_GO}"
+		SHIM_DBG_CONFIG_FILE_NAME="${SHIM_DBG_CONFIG_FILE_NAME_RUNTIME_GO}"
+	fi
 fi
 
 # this is where cloud-hypervisor-cvm gets installed (see package SPEC)

tools/osbuilder/node-builder/azure-linux/package_install.sh

@@ -62,17 +62,18 @@ echo "Installing shim binaries side by side"
 cp -a --backup=numbered "${runtime_go_shim}" "${PREFIX}/${SHIM_BINARIES_PATH}/${shim_binary_runtime_go}"
 cp -a --backup=numbered "${runtime_rs_shim}" "${PREFIX}/${SHIM_BINARIES_PATH}/${shim_binary_runtime_rs}"
 
-default_shim_binary="${shim_binary_runtime_rs}"
-shim_config_src_dir="src/runtime-rs/config"
-if [ "${SHIM_DEFAULT_IMPL}" == "runtime-go" ]; then
-	default_shim_binary="${shim_binary_runtime_go}"
-	shim_config_src_dir="src/runtime/config"
+default_shim_binary="${shim_binary_runtime_go}"
+shim_config_src_dir="src/runtime/config"
+
+if [ "${USE_RUNTIME_RS}" == "yes" ]; then
+	default_shim_binary="${shim_binary_runtime_rs}"
+	shim_config_src_dir="src/runtime-rs/config"
 fi
 
 shim_config_src_dir_runtime_go="src/runtime/config"
 shim_config_src_dir_runtime_rs="src/runtime-rs/config"
 
-echo "Installing default shim (${SHIM_DEFAULT_IMPL})"
+echo "Installing default shim binary: ${default_shim_binary}"
 cp -a --backup=numbered "${PREFIX}/${SHIM_BINARIES_PATH}/${default_shim_binary}" "${PREFIX}/${SHIM_BINARIES_PATH}/${SHIM_BINARY_NAME}"
 
 if [ "${SHIM_REDEPLOY_CONFIG}" == "yes" ]; then
@@ -83,14 +84,14 @@ if [ "${SHIM_REDEPLOY_CONFIG}" == "yes" ]; then
 	cp -a --backup=numbered "${shim_config_src_dir_runtime_go}/${SHIM_DBG_CONFIG_FILE_NAME_RUNTIME_GO}" "${PREFIX}/${SHIM_CONFIG_PATH}/${SHIM_DBG_CONFIG_FILE_NAME_RUNTIME_GO}"
 	cp -a --backup=numbered "${shim_config_src_dir_runtime_rs}/${SHIM_DBG_CONFIG_FILE_NAME_RUNTIME_RS}" "${PREFIX}/${SHIM_CONFIG_PATH}/${SHIM_DBG_CONFIG_FILE_NAME_RUNTIME_RS}"
 
-	echo "Installing default shim configuration (${SHIM_DEFAULT_IMPL})"
+	echo "Installing default shim configuration: ${SHIM_CONFIG_FILE_NAME}"
 	cp -a --backup=numbered "${shim_config_src_dir}/${SHIM_CONFIG_FILE_NAME}" "${PREFIX}/${SHIM_CONFIG_PATH}/${SHIM_CONFIG_INST_FILE_NAME}"
 
 	if [ "${SHIM_USE_DEBUG_CONFIG}" == "yes" ]; then
 		# We simply override the release config with the debug config,
 		# which is probably fine when debugging. Not symlinking as that
 		# would create cycles the next time this script is called.
-		echo "Overriding shim configuration with debug configuration"
+		echo "Overriding shim configuration with debug configuration: ${SHIM_DBG_CONFIG_FILE_NAME}"
 		cp -a --backup=numbered "${shim_config_src_dir}/${SHIM_DBG_CONFIG_FILE_NAME}" "${PREFIX}/${SHIM_CONFIG_PATH}/${SHIM_CONFIG_INST_FILE_NAME}"
 	fi
 else