diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index eaf1751867..8ea1cd44a4 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -307,7 +307,7 @@ then EXTRA_START_ARGS="${EXTRA_START_ARGS} --container-runtime=${CONTAINER_RUNTIME}" fi -timeout 2m ${SUDO_PREFIX}${E2E_BIN} \ +${SUDO_PREFIX}${E2E_BIN} \ -minikube-start-args="--driver=${VM_DRIVER} ${EXTRA_START_ARGS}" \ -test.timeout=${TIMEOUT} -test.v \ ${EXTRA_TEST_ARGS} \ @@ -382,10 +382,12 @@ fi echo $description -echo "{TEST_OUT}" > out/test.out -echo "{JSON_OUT}" > out/json.out -echo "{HTML_OUT}" > out/html.out -echo "{SUMMARY_OUT}" > out/summary.out +REPORTS_PATH=test_reports +mkdir -p "$REPORTS_PATH" +cp "${TEST_OUT}" "$REPORTS_PATH/test.out" +cp "${JSON_OUT}" "$REPORTS_PATH/json.out" +cp "${HTML_OUT}" "$REPORTS_PATH/html.out" +cp "${SUMMARY_OUT}" "$REPORTS_PATH/summary.out" # upload results to GCS JOB_GCS_BUCKET="minikube-builds/logs/${MINIKUBE_LOCATION}/${COMMIT:0:7}/${JOB_NAME}" diff --git a/hack/jenkins/upload_integration_report.sh b/hack/jenkins/upload_integration_report.sh index 8adbd1b938..43bc40c939 100644 --- a/hack/jenkins/upload_integration_report.sh +++ b/hack/jenkins/upload_integration_report.sh @@ -27,9 +27,9 @@ # upload results to GCS -JOB_GCS_BUCKET="minikube-builds/logs/${MINIKUBE_LOCATION}/${COMMIT:0:7}/${JOB_NAME}" +JOB_GCS_BUCKET="minikube-builds/logs/${MINIKUBE_LOCATION}/${COMMIT:0:7}/${UPSTREAM_JOB}" -ARTIFACTS=reports/out +ARTIFACTS=artifacts/test_reports TEST_OUT="$ARTIFACTS/out.txt" echo ">> Copying ${TEST_OUT} to gs://${JOB_GCS_BUCKET}out.txt"