verify: produce JUnit file also for pull-kubernetes-verify-strict-lint

Because this doesn't get invoked through verify.sh, we have to call
logJu ourselves to get a JUnit file. errexit must not be set when
calling logJu, otherwise it does no post-processing.
This commit is contained in:
Patrick Ohly 2023-06-02 13:35:48 +02:00
parent 0b4efddae0
commit f4d326a1fc

View File

@ -18,7 +18,6 @@
# golangci-lint. It does nothing when invoked as part of a normal "make # golangci-lint. It does nothing when invoked as part of a normal "make
# verify". # verify".
set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
@ -29,9 +28,12 @@ fi
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
# include shell2junit library
source "${KUBE_ROOT}/third_party/forked/shell2junit/sh2ju.sh"
# TODO (https://github.com/kubernetes/test-infra/issues/17056): # TODO (https://github.com/kubernetes/test-infra/issues/17056):
# take this additional artifact and convert it to GitHub annotations # take this additional artifact and convert it to GitHub annotations
# to make it easier to see these problems during a PR review. # to make it easier to see these problems during a PR review.
# #
# -g "${ARTIFACTS}/golangci-lint-githubactions.log" # -g "${ARTIFACTS}/golangci-lint-githubactions.log"
"${KUBE_ROOT}/hack/verify-golangci-lint.sh" -r "${PULL_BASE_SHA}" -s juLog -output="${ARTIFACTS:-/tmp/results}" -class="golangci" -name="golangci-strict-pr" -fail="^ERROR: " "${KUBE_ROOT}/hack/verify-golangci-lint.sh" -r "${PULL_BASE_SHA}" -s