reverts removal of parallel run from critest

Signed-off-by: Paul S. Schweigert <[email protected]> As discussed in containerd#6903, running ginkgo tests in parallel while trying to skip wasn't working. However, now that kubernetes-sigs/cri-tools#930 has fixed the issue upstream, we can revert back to running our tests in parallel with the skip.
psschwei · May 12, 2022 · 894d689 · 894d689
1 parent 9aa6725
commit 894d689
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -271,8 +271,7 @@ EOF
         fi
         trap cleanup EXIT
         ctr version
-        # TODO run in parallel, see https://github.com/containerd/containerd/issues/6903
-        critest --ginkgo.skip='HostIpc is true' --report-dir="${REPORT_DIR}"
+        critest --parallel=$[$(nproc)+2] --ginkgo.skip='HostIpc is true' --report-dir="${REPORT_DIR}"
     SHELL
   end
 

diff --git a/script/setup/critools-version b/script/setup/critools-version
@@ -1 +1 @@
-v1.24.0
+v1.24.1
diff --git a/script/setup/install-critools b/script/setup/install-critools
@@ -23,7 +23,7 @@ set -eu -o pipefail
 script_dir="$(cd -- "$(dirname -- "$0")" > /dev/null 2>&1; pwd -P)"
 
 cd "$(go env GOPATH)"
-go install github.com/onsi/ginkgo/ginkgo@v1.16.5
+go install github.com/onsi/ginkgo/ginkgo@v2.1.4
 
 : "${CRITEST_COMMIT:=$(cat "${script_dir}/critools-version")}"
 : "${DESTDIR:=""}"