mirror of
https://github.com/containerd/containerd.git
synced 2026-11-06 21:37:23 +00:00
reverts removal of parallel run from critest
Signed-off-by: Paul S. Schweigert <paulschw@us.ibm.com> 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.
This commit is contained in:
3 files changed
+3
-4
No files matched your search
Vendored
+1
-2
@@ -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
|
||||
|
||||
|
||||
@@ -1 +1 @@
|
||||
v1.24.0
|
||||
v1.24.1
|
||||
@@ -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:=""}"
|
||||
|
||||
Reference in new issue
Block a user