Skip to content

Commit

Permalink
reverts removal of parallel run from critest
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
psschwei committed May 12, 2022
1 parent 74c1e96 commit 82a77be
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
4 changes: 1 addition & 3 deletions Vagrantfile
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion script/setup/critools-version
@@ -1 +1 @@
v1.24.0
v1.24.1
2 changes: 1 addition & 1 deletion script/setup/install-critools
Expand Up @@ -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:=""}"
Expand Down

0 comments on commit 82a77be

Please sign in to comment.