Merge pull request #125 from YJDoc2/containerd-test-fix

fix initial provisions always running
utam0k · Nov 28, 2022 · 96cc5e3 · 96cc5e3
2 parents 737c09a + e3bf698
commit 96cc5e3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -24,7 +24,7 @@ clean:
 	./scripts/clean.sh $(ROOT)
 
 containerd-test:
-	VAGRANT_VAGRANTFILE=Vagrantfile.containerd2youki vagrant up --provision-with bootstrap | true
+	VAGRANT_VAGRANTFILE=Vagrantfile.containerd2youki vagrant up
 	VAGRANT_VAGRANTFILE=Vagrantfile.containerd2youki vagrant provision --provision-with test
 
 
diff --git a/Vagrantfile.containerd2youki b/Vagrantfile.containerd2youki
@@ -7,7 +7,7 @@ Vagrant.configure("2") do |config|
 
     config.vm.provider "virtualbox" do |v|
       v.memory = 4096
-      v.cpus = 2
+      v.cpus = 4
     end
 
     config.vm.provision "bootstrap", type: "shell" do |s|
@@ -50,7 +50,7 @@ Vagrant.configure("2") do |config|
           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
+          grep "FAIL: " result.txt || true
         SHELL
     end
 end