use start cluster script for CRI tests

Signed-off-by: shyam Jesal <[email protected]>

.github/workflows/cri_minio_test.yml

@@ -47,20 +47,8 @@ jobs:
  GOPATH: /root/tmp/gopath
  run: go build
 
- - name: Create logdir
- run: mkdir -p -m777 -p /tmp/ctrd-logs/${{ github.run_id }}
-
- - name: Start Containerd
- run: sudo containerd 1>/tmp/ctrd-logs/${{ github.run_id }}/ctrd.out 2>/tmp/ctrd-logs/${{ github.run_id }}/ctrd.err &
-
- - name: Start Firecracker-containerd
- run: sleep 1s && sudo /usr/local/bin/firecracker-containerd --config /etc/firecracker-containerd/config.toml 1>/tmp/ctrd-logs/${{ github.run_id }}/fccd.out 2>/tmp/ctrd-logs/${{ github.run_id }}/fccd.err &
-
- - name: Start vHive
- run: sleep 1s && sudo ./vhive -dbg 1>/tmp/ctrd-logs/${{ github.run_id }}/fccd.out 2>/tmp/ctrd-logs/${{ github.run_id }}/fccd.err &
-
- - name: Create k8s cluster
- run: sleep 1s && ./scripts/cluster/create_one_node_cluster.sh
+ - name: Start vHive cluster
+ run: ./scripts/cloudlab/start_onenode_vhive_cluster.sh
 
  - name: modify $PATH
  env:

cri/Makefile

@@ -23,15 +23,9 @@
 EXTRAGOARGS:=-v -race -cover
 CTRDLOGDIR:=/tmp/ctrd-logs/${GITHUB_RUN_ID}
 test:
- sudo mkdir -p -m777 -p $(CTRDLOGDIR)
- sudo containerd 1>$(CTRDLOGDIR)/ctrd.out 2>$(CTRDLOGDIR)/ctrd.err &
- sleep 1s
- sudo /usr/local/bin/firecracker-containerd --config /etc/firecracker-containerd/config.toml 1>$(CTRDLOGDIR)/fccd.out 2>$(CTRDLOGDIR)/fccd.err &
- sleep 1s
- sudo ./../vhive -dbg 1>$(CTRDLOGDIR)/orch.out 2>$(CTRDLOGDIR)/orch.err &
- sleep 1s
 
- ./../scripts/cluster/create_one_node_cluster.sh
+ ./../scripts/cloudlab/start_onenode_vhive_cluster.sh
+
  sleep 2m
  KUBECONFIG=/etc/kubernetes/admin.conf ./../scripts/setup_zipkin.sh
  sleep 5s

scripts/cloudlab/start_vhive_cluster.sh → scripts/cloudlab/start_onenode_vhive_cluster.sh

@@ -28,14 +28,21 @@ SCRIPTS=$ROOT/scripts
 
 $SCRIPTS/github_runner/clean_cri_runner.sh
 
-if [ ! -d "$HOME/ctrd-logs" ]; then
- $SCRIPTS/cloudlab/setup_node.sh
- mkdir -p ~/ctrd-logs
-fi
+CTRDLOGDIR=/tmp/ctrd-logs/$GITHUB_RUN_ID
 
-sudo containerd 1>~/ctrd-logs/ctrd.out 2>~/ctrd-logs/ctrd.err &
-sudo firecracker-containerd --config /etc/firecracker-containerd/config.toml 1>~/ctrd-logs/fccd.out 2>~/ctrd-logs/fccd.err &
-source /etc/profile && cd $ROOT && go build && sudo ./vhive 1>~/ctrd-logs/orch.out 2>~/ctrd-logs/orch.err &
-$SCRIPTS/cluster/create_one_node_cluster.sh
+sudo mkdir -p -m777 -p $CTRDLOGDIR
+
+sudo containerd 1>$CTRDLOGDIR/ctrd.out 2>$CTRDLOGDIR/ctrd.err &
+sleep 1s
+sudo /usr/local/bin/firecracker-containerd --config /etc/firecracker-containerd/config.toml 1>$CTRDLOGDIR/fccd.out 2>$CTRDLOGDIR/fccd.err &
+sleep 1s
 
+if [ ! -f "$ROOT/vhive" ]; then
+ source /etc/profile && cd $ROOT && go build
+fi
+sleep 1s
+
+cd $ROOT && sudo ./vhive -dbg 1>$CTRDLOGDIR/orch.out 2>$CTRDLOGDIR/orch.err &
+sleep 1s
 
+$SCRIPTS/cluster/create_one_node_cluster.sh