Skip to content

K
k3s
Commit 2eccd87c authored by Zach Loafman's avatar Zach Loafman
Browse files
Options

Adjust the Jenkins E2E_REPORT_DIR to something less silly

Start of a fix for complaints on #8852.
parent 0579c19a
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 1 deletion
hack/jenkins/e2e.sh
View file @ 2eccd87c
...@@ -204,7 +204,9 @@ fi ...@@ -204,7 +204,9 @@ fi
cd kubernetes cd kubernetes
# Have cmd/e2e run by goe2e.sh generate JUnit report in ${WORKSPACE}/junit*.xml # Have cmd/e2e run by goe2e.sh generate JUnit report in ${WORKSPACE}/junit*.xml
export E2E_REPORT_DIR=${WORKSPACE} ARTIFACTS=${WORKSPACE}/_artifacts
mkdir -p ${ARTIFACTS}
export E2E_REPORT_DIR=${ARTIFACTS}
### Set up ### ### Set up ###
if [[ "${E2E_UP,,}" == "true" ]]; then if [[ "${E2E_UP,,}" == "true" ]]; then
...@@ -220,6 +222,13 @@ if [[ "${E2E_TEST,,}" == "true" ]]; then ...@@ -220,6 +222,13 @@ if [[ "${E2E_TEST,,}" == "true" ]]; then
go run ./hack/e2e.go ${E2E_OPT} -v --test --test_args="${GINKGO_TEST_ARGS}--ginkgo.noColor" || true go run ./hack/e2e.go ${E2E_OPT} -v --test --test_args="${GINKGO_TEST_ARGS}--ginkgo.noColor" || true
fi fi
# TODO(zml): We have a bunch of legacy Jenkins configs that are
# expecting junit*.xml to be in ${WORKSPACE} root and it's Friday
# afternoon, so just put the junit report where it's expected.
for junit in ${ARTIFACTS}/junit*.xml; do
ln -s ${junit} ${WORKSPACE}
done
### Clean up ### ### Clean up ###
if [[ "${E2E_DOWN,,}" == "true" ]]; then if [[ "${E2E_DOWN,,}" == "true" ]]; then
# Sleep before deleting the cluster to give the controller manager time to # Sleep before deleting the cluster to give the controller manager time to
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment