Merge pull request #5267 from estesp/up-integ-timeout

dmcgowan · web-flow · commit ed8cf6077e8f · 2021-03-25T09:44:47.000-07:00
Extend default timeout for nested VM integration run
diff --git a/Vagrantfile b/Vagrantfile
@@ -204,7 +204,7 @@ EOF
         set -eux -o pipefail
         rm -rf /var/lib/containerd-test /run/containerd-test
         cd ${GOPATH}/src/github.com/containerd/containerd
-        make integration EXTRA_TESTFLAGS="-no-criu -test.v" TEST_RUNTIME=io.containerd.runc.v2 RUNC_FLAVOR=$RUNC_FLAVOR
+        make integration EXTRA_TESTFLAGS="-timeout 15m -no-criu -test.v" TEST_RUNTIME=io.containerd.runc.v2 RUNC_FLAVOR=$RUNC_FLAVOR
     SHELL
   end
 
