reverts removal of parallel run from critest

psschwei · psschwei · commit 82a77be2dd20 · 2022-05-12T18:32:48.000-04:00
Signed-off-by: Paul S. Schweigert <paulschw@us.ibm.com> (cherry picked from commit 7300296) As discussed in #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. Signed-off-by: Paul S. Schweigert <paulschw@us.ibm.com>
diff --git a/Vagrantfile b/Vagrantfile
@@ -265,9 +265,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/v2/ginkgo@v2.1.4
 
 : "${CRITEST_COMMIT:=$(cat "${script_dir}/critools-version")}"
 : "${DESTDIR:=""}"
