diff --git a/Vagrantfile b/Vagrantfile index 232f748c1..e9b73994e 100644 --- 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 index de8c3cf6c..68d2b75aa 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 001322792..251a83e0b 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:=""}"