From 82a77be2dd20790a14a1c96f21be41b8d597cc2e Mon Sep 17 00:00:00 2001 From: "Paul S. Schweigert" Date: Thu, 12 May 2022 11:06:15 -0400 Subject: [PATCH] reverts removal of parallel run from critest Signed-off-by: Paul S. Schweigert (cherry picked from commit 7300296cb) As discussed in https://github.com/containerd/containerd/issues/6903, running ginkgo tests in parallel while trying to skip wasn't working. However, now that https://github.com/kubernetes-sigs/cri-tools/pull/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 --- Vagrantfile | 4 +--- script/setup/critools-version | 2 +- script/setup/install-critools | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 856d3c5f6901..792d57014167 100644 --- 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 index de8c3cf6c3ad..68d2b75aa87c 100644 --- 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 index 00132279276e..251a83e0b506 100755 --- 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:=""}"