github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #9017 from zmerlynn/adjust-report-dir 

Adjust the Jenkins E2E_REPORT_DIR to something less silly
pull/6/head
Jeff Grafton 2015-05-29 14:13:04 -07:00
parent ae8bc2c47b 2eccd87ccb
commit a3211dfdbf
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hack/jenkins/e2e.sh
View File

@ -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
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