Merge pull request #1297 from utam0k/Makefile

Improve the flow of the containerd test with youki

Makefile

@@ -25,3 +25,9 @@ validate-rust-tests:
 
 clean:
 	./scripts/clean.sh $(ROOT)
+
+containerd-test:
+	VAGRANT_VAGRANTFILE=Vagrantfile.containerd2youki vagrant up
+	VAGRANT_VAGRANTFILE=Vagrantfile.containerd2youki vagrant provision --provision-with test
+
+

Vagrantfile.containerd2youki

@@ -3,14 +3,15 @@
 
 Vagrant.configure("2") do |config|
     config.vm.box = "generic/ubuntu2204"
-    config.vm.synced_folder '.', '/vagrant/youki', disabled: true
+    config.vm.synced_folder '.', '/vagrant/youki', disabled: false
 
     config.vm.provider "virtualbox" do |v|
       v.memory = 4096
-      v.cpus = 2
+      v.cpus = 4
     end
 
-    config.vm.provision "shell", inline: <<-SHELL
+    config.vm.provision "bootstrap", type: "shell" do |s|
+      s.inline = <<-SHELL
         set -e -u -o pipefail
         apt-get update && apt-get install -y \
           make \
@@ -24,17 +25,13 @@ Vagrant.configure("2") do |config|
           btrfs-progs
         wget --quiet https://go.dev/dl/go1.18.1.linux-amd64.tar.gz -O /tmp/go1.18.1.linux-amd64.tar.gz
         rm -rf /usr/local/go && tar -C /usr/local -xzf /tmp/go1.18.1.linux-amd64.tar.gz
-      curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-      echo "export PATH=$PATH:$HOME/.cargo/bin:/usr/local/go/bin" >> ~/.bashrc
+        echo "export PATH=$PATH:/usr/local/go/bin" >> ~/.bashrc
         echo "export GOPATH=$HOME/go" >> ~/.bashrc
         export PATH=$PATH:$HOME/.cargo/bin:/usr/local/go/bin
         export GOPATH=$HOME/go
 
-      rm -rf /root/containerd2youki
         git clone https://github.com/containerd/containerd \
           /root/go/src/github.com/containerd/containerd -b v1.5.11
-      git clone https://github.com/containers/youki \
-        /root/containerd2youki/youki
 
         cd /root/go/src/github.com/containerd/containerd
         make
@@ -44,8 +41,16 @@ Vagrant.configure("2") do |config|
         ./script/setup/install-critools
         rm -rf /bin/runc /sbin/runc /usr/sbin/runc /usr/bin/runc
 
-      cd /root/containerd2youki/youki
-      make release-build
-      cp youki /usr/bin/runc
+        cp /vagrant/youki/youki /usr/bin/runc
       SHELL
+    end
+
+    config.vm.provision "test", type: "shell" do |s|
+        s.inline = <<-SHELL
+          cd /root/go/src/github.com/containerd/containerd/
+          export PATH=$PATH:$HOME/.cargo/bin:/usr/local/go/bin
+          make TEST_RUNTIME=io.containerd.runc.v2 TESTFLAGS="-timeout 120m" integration | tee result.txt
+          grep "FAIL: " result.txt || true
+        SHELL
+    end
 end

docs/src/developer/containerd_integration_test_using_youki.md

@@ -8,11 +8,5 @@ Find the cause of not supporting Kubernetes by integration test of CRI Runtime.
 ## local
 
 ```console
-VAGRANT_VAGRANTFILE=Vagrantfile.containerd2youki vagrant up
-vagrant ssh
-
-# in VM
-sudo -i
-cd /root/go/src/github.com/containerd/containerd/
-make TEST_RUNTIME=io.containerd.runc.v2 TESTFLAGS="-timeout 120m" integration
+make containerd-test
 ```