feat(build_library): Add --upload_path option to override default

This will be used to upload the latest images built from master, we
don't need every build so we just want to upload to a 'master'
directory, not one named for the current version.
This commit is contained in:
Michael Marineau 2013-07-10 19:44:40 -04:00
parent 15b637aa78
commit ddb92a0887

View File

@ -4,6 +4,7 @@
GSUTIL_OPTS= GSUTIL_OPTS=
UPLOAD_ROOT="gs://storage.core-os.net/coreos" UPLOAD_ROOT="gs://storage.core-os.net/coreos"
UPLOAD_PATH=
UPLOAD_DEFAULT=${FLAGS_FALSE} UPLOAD_DEFAULT=${FLAGS_FALSE}
if [[ ${COREOS_OFFICIAL:-0} -eq 1 ]]; then if [[ ${COREOS_OFFICIAL:-0} -eq 1 ]]; then
UPLOAD_DEFAULT=${FLAGS_TRUE} UPLOAD_DEFAULT=${FLAGS_TRUE}
@ -16,6 +17,8 @@ DEFINE_boolean parallel ${FLAGS_TRUE} \
"Enable parallelism in gsutil." "Enable parallelism in gsutil."
DEFINE_boolean upload ${UPLOAD_DEFAULT} \ DEFINE_boolean upload ${UPLOAD_DEFAULT} \
"Upload all packages/images via gsutil." "Upload all packages/images via gsutil."
DEFINE_string upload_path "" \
"Upload files to an alternative location. Must be a full gs:// URL."
check_gsutil_opts() { check_gsutil_opts() {
[[ ${FLAGS_upload} -eq ${FLAGS_TRUE} ]] || return 0 [[ ${FLAGS_upload} -eq ${FLAGS_TRUE} ]] || return 0
@ -24,6 +27,11 @@ check_gsutil_opts() {
GSUTIL_OPTS="-m" GSUTIL_OPTS="-m"
fi fi
if [[ -n "${FLAGS_upload_path}" ]]; then
# Make sure the path doesn't end with a slash
UPLOAD_PATH="${FLAGS_upload_path%%/}"
fi
if [[ ! -f "$HOME/.boto" ]]; then if [[ ! -f "$HOME/.boto" ]]; then
die_notrace "Please run gsutil config to create ~/.boto" die_notrace "Please run gsutil config to create ~/.boto"
fi fi
@ -34,9 +42,10 @@ upload_packages() {
[[ -n "${BOARD}" ]] || die "board_options.sh must be sourced first" [[ -n "${BOARD}" ]] || die "board_options.sh must be sourced first"
local BOARD_PACKAGES="${1:-"${BOARD_ROOT}/packages"}" local BOARD_PACKAGES="${1:-"${BOARD_ROOT}/packages"}"
local UPLOAD_PATH="${UPLOAD_ROOT}/${BOARD}/${COREOS_VERSION_STRING}/pkgs/" : ${UPLOAD_PATH:="${UPLOAD_ROOT}/${BOARD}/${COREOS_VERSION_STRING}"}
info "Uploading packages" info "Uploading packages"
gsutil ${GSUTIL_OPTS} cp -R "${BOARD_PACKAGES}"/* "${UPLOAD_PATH}" gsutil ${GSUTIL_OPTS} cp -R "${BOARD_PACKAGES}"/* "${UPLOAD_PATH}/pkgs/"
} }
make_digests() { make_digests() {
@ -57,7 +66,7 @@ upload_image() {
[[ -n "${BOARD}" ]] || die "board_options.sh must be sourced first" [[ -n "${BOARD}" ]] || die "board_options.sh must be sourced first"
local BUILT_IMAGE="$1" local BUILT_IMAGE="$1"
local UPLOAD_PATH="${UPLOAD_ROOT}/${BOARD}/${COREOS_VERSION_STRING}/" : ${UPLOAD_PATH:="${UPLOAD_ROOT}/${BOARD}/${COREOS_VERSION_STRING}"}
if [[ ! -f "${BUILT_IMAGE}" ]]; then if [[ ! -f "${BUILT_IMAGE}" ]]; then
die "Image '${BUILT_IMAGE}' does not exist!" die "Image '${BUILT_IMAGE}' does not exist!"
@ -76,5 +85,5 @@ upload_image() {
info "Uploading ${BUILT_IMAGE##*/}" info "Uploading ${BUILT_IMAGE##*/}"
gsutil ${GSUTIL_OPTS} cp "${BUILT_IMAGE}" \ gsutil ${GSUTIL_OPTS} cp "${BUILT_IMAGE}" \
"${BUILT_IMAGE}.DIGESTS" "${UPLOAD_PATH}" "${BUILT_IMAGE}.DIGESTS" "${UPLOAD_PATH}/"
} }