mirror of https://github.com/k3s-io/k3s
Clean up upload-to-gcs.sh to remove unnecessary cruft
Jeff Grafton
parent
2172e0dea0
commit
03ec0e12d2
|
|
@ -14,26 +14,21 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# Source this script in the Jenkins "Execute shell" build action to have all
|
||||
# test artifacts and the console log uploaded at the end of the test run.
|
||||
# Run this script in the Jenkins "Execute shell" build action to upload test
|
||||
# artifacts to GCS. Since it uses gsutil directly, it's a bit faster at
|
||||
# uploading large numbers of files than the GCS Jenkins plugin.
|
||||
# We also intentionally ignore gsutil errors since we don't want failed uploads
|
||||
# to fail the entire test run (#13548).
|
||||
|
||||
# For example, you might use the following snippet as the first few lines:
|
||||
#
|
||||
# if [[ -f ./hack/jenkins/upload-to-gcs.sh ]]; then
|
||||
# source ./hack/jenkins/upload-to-gcs.sh
|
||||
# else
|
||||
# curl -fsS -o upload-to-gcs.sh --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/upload-to-gcs.sh" && source upload-to-gcs.sh; rm -f upload-to-gcs.sh
|
||||
# fi
|
||||
|
||||
# Note that this script requires the Jenkins shell binary to be set to bash, not
|
||||
# the system default (which may be dash on Debian-based systems).
|
||||
# Also, for magicfile support to work correctly, the "file" utility must be
|
||||
# Note: for magicfile support to work correctly, the "file" utility must be
|
||||
# installed.
|
||||
|
||||
# TODO: eventually fold this all into upload-finished.sh, once every job is
|
||||
# using it.
|
||||
|
||||
set -o errexit
|
||||
set -o nounset
|
||||
set -o pipefail
|
||||
set -o xtrace
|
||||
|
||||
if [[ ${JOB_NAME} =~ -pull- ]]; then
|
||||
: ${JENKINS_GCS_LOGS_PATH:="gs://kubernetes-jenkins/pr-logs/pull/${ghprbPullId:-unknown}"}
|
||||
|
|
@ -41,47 +36,23 @@ else
|
|||
: ${JENKINS_GCS_LOGS_PATH:="gs://kubernetes-jenkins/logs"}
|
||||
fi
|
||||
|
||||
: ${JENKINS_UPLOAD_TO_GCS:="y"}
|
||||
readonly artifacts_path="${WORKSPACE}/_artifacts"
|
||||
readonly gcs_job_path="${JENKINS_GCS_LOGS_PATH}/${JOB_NAME}"
|
||||
readonly gcs_build_path="${gcs_job_path}/${BUILD_NUMBER}"
|
||||
readonly gcs_acl="public-read"
|
||||
|
||||
# Upload the build log and all test artifacts (under _artifacts) to GCS when
|
||||
# JENKINS_UPLOAD_TO_GCS is set to y.
|
||||
# We intentionally ignore gsutil errors since we don't want failed uploads to
|
||||
# fail the entire test run (#13548).
|
||||
function upload_logs_to_gcs() {
|
||||
if [[ ! ${JENKINS_UPLOAD_TO_GCS:-} =~ ^[yY]$ ]]; then
|
||||
return
|
||||
for upload_attempt in $(seq 3); do
|
||||
echo "Uploading to ${gcs_build_path} (attempt ${upload_attempt})"
|
||||
if [[ -d "${artifacts_path}" && -n $(ls -A "${artifacts_path}") ]]; then
|
||||
gsutil -m -q -o "GSUtil:use_magicfile=True" cp -a "${gcs_acl}" -r -c \
|
||||
-z log,txt,xml "${artifacts_path}" "${gcs_build_path}/artifacts" || continue
|
||||
fi
|
||||
local -r artifacts_path="${WORKSPACE}/_artifacts"
|
||||
local -r gcs_job_path="${JENKINS_GCS_LOGS_PATH}/${JOB_NAME}"
|
||||
local -r gcs_build_path="${gcs_job_path}/${BUILD_NUMBER}"
|
||||
local -r gcs_acl="public-read"
|
||||
local -r console_log="${JENKINS_HOME}/jobs/${JOB_NAME}/builds/${BUILD_NUMBER}/log"
|
||||
local -r filtered_console_log="${WORKSPACE}/console-log.txt"
|
||||
for upload_attempt in $(seq 3); do
|
||||
echo "Uploading to ${gcs_build_path} (attempt ${upload_attempt})"
|
||||
if [[ -d "${artifacts_path}" && -n $(ls -A "${artifacts_path}") ]]; then
|
||||
gsutil -m -q -o "GSUtil:use_magicfile=True" cp -a "${gcs_acl}" -r -c \
|
||||
-z log,txt,xml "${artifacts_path}" "${gcs_build_path}/artifacts" || continue
|
||||
fi
|
||||
# The console log only exists on the Jenkins master, so don't fail if it
|
||||
# doesn't exist.
|
||||
if [[ -f "${console_log}" ]]; then
|
||||
# Remove ANSI escape sequences from the console log before uploading.
|
||||
sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" \
|
||||
"${console_log}" > "${filtered_console_log}"
|
||||
gsutil -q cp -a "${gcs_acl}" -z txt "${filtered_console_log}" "${gcs_build_path}/" || continue
|
||||
fi
|
||||
# Mark this build as the latest completed.
|
||||
{
|
||||
echo "BUILD_NUMBER=${BUILD_NUMBER}"
|
||||
echo "GIT_COMMIT=${GIT_COMMIT:-}"
|
||||
} | gsutil -q -h "Content-Type:text/plain" -h "Cache-Control:private, max-age=0, no-transform" \
|
||||
# Mark this build as the latest completed.
|
||||
echo "${BUILD_NUMBER}" | \
|
||||
gsutil -q -h "Content-Type:text/plain" -h "Cache-Control:private, max-age=0, no-transform" \
|
||||
cp -a "${gcs_acl}" - "${gcs_job_path}/latest-build.txt" || continue
|
||||
break # all uploads succeeded if we hit this point
|
||||
done
|
||||
local -r results_url=${gcs_build_path//"gs:/"/"https://storage.cloud.google.com"}
|
||||
echo -e "\n\n\n*** View logs and artifacts at ${results_url} ***\n\n"
|
||||
}
|
||||
break # all uploads succeeded if we hit this point
|
||||
done
|
||||
|
||||
# Automatically upload logs to GCS on exit or timeout.
|
||||
trap upload_logs_to_gcs EXIT SIGTERM SIGINT
|
||||
readonly results_url=${gcs_build_path//"gs:/"/"https://storage.cloud.google.com"}
|
||||
echo -e "\n\n\n*** View logs and artifacts at ${results_url} ***\n\n"
|
||||
|
|
|
|||
Loading…
Reference in New Issue