Use make in scripts instead of cargo-build

Signed-off-by: Alberto Faria <[email protected]>

tests/env.sh

@@ -111,8 +111,8 @@ __rel() {
 
 __build_runtime() {
     __big_log 33 'Building crun-vm...'
-    __log_and_run cargo build
-    runtime=$repo_root/target/debug/crun-vm
+    __log_and_run make -C "$repo_root"
+    runtime=$repo_root/out/crun-vm
 }
 
 __extra_cleanup() { :; }
@@ -201,7 +201,7 @@ build)
         virtiofsd
     __exec sudo dnf clean all
 
-    daemon_json='{ "runtimes": { "crun-vm": { "path": "/home/fedora/target/debug/crun-vm" } } }'
+    daemon_json='{ "runtimes": { "crun-vm": { "path": "/home/fedora/bin/crun-vm" } } }'
     __exec sudo mkdir -p /etc/docker
     __exec "echo ${daemon_json@Q} | sudo tee /etc/docker/daemon.json"
 
@@ -246,7 +246,7 @@ start)
         --memory 8g \
         --rm -dit \
         -v "$temp_dir":/home/fedora/images:z \
-        -v "$repo_root/target":/home/fedora/target:z \
+        -v "$repo_root/out":/home/fedora/bin:z \
         "$env_image"
 
     # shellcheck disable=SC2317
@@ -331,11 +331,11 @@ run)
             case "$engine" in
             podman)
                 engine_cmd=( podman )
-                runtime_in_env=/home/fedora/target/debug/crun-vm
+                runtime_in_env=/home/fedora/bin/crun-vm
                 ;;
             rootful-podman)
                 engine_cmd=( sudo podman )
-                runtime_in_env=/home/fedora/target/debug/crun-vm
+                runtime_in_env=/home/fedora/bin/crun-vm
                 ;;
             docker)
                 engine_cmd=( sudo docker )

util/minikube-start.sh

@@ -4,6 +4,7 @@
 set -o errexit -o pipefail -o nounset
 
 script_dir="$( dirname "$0" | xargs readlink -e )"
+repo_root=$script_dir/../..
 
 __minikube() {
     minikube -p=crun-vm-example "$@"
@@ -25,7 +26,7 @@ __apt_get() {
 
 # build runtime
 
-cargo build
+make -C "$repo_root"
 
 # create minikube cluster
 
@@ -57,7 +58,7 @@ __ssh 'tee --append /etc/crio/crio.conf <<EOF
 runtime_path = "/usr/local/bin/crun-vm"
 EOF'
 
-__cp "${script_dir}/../../target/debug/crun-vm" /usr/local/bin/crun-vm
+__cp "$repo_root/out/crun-vm" /usr/local/bin/crun-vm
 __ssh chmod +x /usr/local/bin/crun-vm
 
 # reload cluster so that the new runtime is picked up