setup_board, update_chroot, dev container: use new bincache mirror

This updates the default settings in build scripts to use
https://mirror.release.flatcar-linux.net/
instead of the google storage bucket if no binhost or FLATCAR_DEV_BUILDS
is specified.

Defaults are updated for
* update_chroot (runs at SDK initialisation time)
* setup_board (creates /boards/[ARCH]/) chroots
* the development container
* set_version
This commit is contained in:
Thilo Fromm 2021-10-05 12:15:14 +02:00
parent ccdc52cc15
commit 51aac23dc8
5 changed files with 27 additions and 8 deletions

View File

@ -6,9 +6,9 @@ get_binhost_url() {
local image_group=$1 local image_group=$1
local image_path=$2 local image_path=$2
if [ "${image_group}" == "developer" ]; then if [ "${image_group}" == "developer" ]; then
echo "https://storage.googleapis.com/flatcar-jenkins/${image_group}/boards/${BOARD}/${FLATCAR_VERSION}/${image_path}" echo "${FLATCAR_DEV_BUILDS}/${image_group}/boards/${BOARD}/${FLATCAR_VERSION}/${image_path}"
else else
echo "https://storage.googleapis.com/flatcar-jenkins/boards/${BOARD}/${FLATCAR_VERSION_ID}/${image_path}" echo "${FLATCAR_DEV_BUILDS}/boards/${BOARD}/${FLATCAR_VERSION_ID}/${image_path}"
fi fi
} }

View File

@ -337,7 +337,7 @@ readonly COREOS_EPOCH=1372636800
TODAYS_VERSION=$(( (`date +%s` - ${COREOS_EPOCH}) / 86400 )) TODAYS_VERSION=$(( (`date +%s` - ${COREOS_EPOCH}) / 86400 ))
# Download URL prefix for SDK and board binary packages # Download URL prefix for SDK and board binary packages
: ${FLATCAR_DEV_BUILDS:=https://storage.googleapis.com/flatcar-jenkins} : ${FLATCAR_DEV_BUILDS:=https://mirror.release.flatcar-linux.net}
# Load developer's custom settings. Default location is in scripts dir, # Load developer's custom settings. Default location is in scripts dir,
# since that's available both inside and outside the chroot. By convention, # since that's available both inside and outside the chroot. By convention,

View File

@ -2,7 +2,7 @@
set -euo pipefail set -euo pipefail
DEFAULT_BASE_URL="https://storage.googleapis.com/flatcar-jenkins" DEFAULT_BASE_URL="https://mirror.release.flatcar-linux.net"
DEV_BOARD_URL="${DEFAULT_BASE_URL}/developer" DEV_BOARD_URL="${DEFAULT_BASE_URL}/developer"
DEFAULT_SDK_URL="${DEFAULT_BASE_URL}/sdk" DEFAULT_SDK_URL="${DEFAULT_BASE_URL}/sdk"
DEV_SDK_URL="${DEFAULT_BASE_URL}/developer/sdk" DEV_SDK_URL="${DEFAULT_BASE_URL}/developer/sdk"
@ -41,14 +41,34 @@ Usage: $0 FLAGS...
--file FILE: Modify another file than ${FILE}, useful if run --file FILE: Modify another file than ${FILE}, useful if run
outside of the SDK chroot. If /dev/stdout or outside of the SDK chroot. If /dev/stdout or
/dev/stderr is used, only new values are printed. /dev/stderr is used, only new values are printed.
--binhost Use a custom binhost (defaults to '${DEFAULT_BASE_URL}').
This will update BOARD and SDK URLs accordingly.
" "
exit 1 exit 1
fi fi
# --binhost needs to be evaluated first since it impacts other variables set below
custom_binhost="false"
for arg in ${@} ; do
if $custom_binhost; then
echo "Using custom binhost '${arg}'"
DEFAULT_BASE_URL="${arg}"
DEV_BOARD_URL="${DEFAULT_BASE_URL}/developer"
DEFAULT_SDK_URL="${DEFAULT_BASE_URL}/sdk"
DEV_SDK_URL="${DEFAULT_BASE_URL}/developer/sdk"
break
fi
if [ "$arg" = "--binhost" ] ; then
custom_binhost="true"
fi
done
while [[ $# -gt 0 ]]; do while [[ $# -gt 0 ]]; do
ARG="$1" ARG="$1"
shift shift
case "${ARG}" in case "${ARG}" in
--binhost) # handled separately above, pass
shift;;
--board-version) --board-version)
VAL="$1" VAL="$1"
shift shift

View File

@ -28,7 +28,7 @@ DEFINE_boolean getbinpkg "${FLAGS_TRUE}" \
DEFINE_string getbinpkgver "" \ DEFINE_string getbinpkgver "" \
"Use binary packages from a specific version." "Use binary packages from a specific version."
DEFINE_string binhost "" \ DEFINE_string binhost "" \
"Use binary packages from a specific location (e.g. https://storage.googleapis.com/flatcar-jenkins/sdk/amd64/2000.0.0/pkgs)" "Use binary packages from a specific location instead of $FLATCAR_DEV_BUILDS/... "
DEFINE_boolean toolchainpkgonly "${FLAGS_FALSE}" \ DEFINE_boolean toolchainpkgonly "${FLAGS_FALSE}" \
"Use binary packages only for the board toolchain." "Use binary packages only for the board toolchain."
DEFINE_boolean skip_toolchain_update "${FLAGS_FALSE}" \ DEFINE_boolean skip_toolchain_update "${FLAGS_FALSE}" \

View File

@ -6,6 +6,7 @@
. "$(dirname "$0")/common.sh" || exit 1 . "$(dirname "$0")/common.sh" || exit 1
. "${BUILD_LIBRARY_DIR}/toolchain_util.sh"
# Script must run inside the chroot # Script must run inside the chroot
assert_inside_chroot "$@" assert_inside_chroot "$@"
@ -28,7 +29,7 @@ DEFINE_string toolchain_boards "" \
DEFINE_string dev_builds_sdk "" \ DEFINE_string dev_builds_sdk "" \
"Set FLATCAR_DEV_BUILDS_SDK which defaults to FLATCAR_DEV_BUILDS/sdk" "Set FLATCAR_DEV_BUILDS_SDK which defaults to FLATCAR_DEV_BUILDS/sdk"
DEFINE_string binhost "" \ DEFINE_string binhost "" \
"Use binary packages from a specific location (e.g. https://storage.googleapis.com/flatcar-jenkins/sdk/amd64/2000.0.0/pkgs)" "Use binary packages from a specific location (like $(get_sdk_binhost | tr '\n' ' '}))"
FLAGS_HELP="usage: $(basename $0) [flags] FLAGS_HELP="usage: $(basename $0) [flags]
Performs an update of the chroot. This script is called as part of Performs an update of the chroot. This script is called as part of
@ -57,8 +58,6 @@ if [[ -n "${FLAGS_dev_builds_sdk}" ]]; then
FLATCAR_DEV_BUILDS_SDK="${FLAGS_dev_builds_sdk}" FLATCAR_DEV_BUILDS_SDK="${FLAGS_dev_builds_sdk}"
fi fi
. "${BUILD_LIBRARY_DIR}/toolchain_util.sh"
PORTAGE_STABLE_OVERLAY="${REPO_ROOT}/src/third_party/portage-stable" PORTAGE_STABLE_OVERLAY="${REPO_ROOT}/src/third_party/portage-stable"
CROSSDEV_OVERLAY="/usr/local/portage/crossdev" CROSSDEV_OVERLAY="/usr/local/portage/crossdev"
COREOS_OVERLAY="${REPO_ROOT}/src/third_party/coreos-overlay" COREOS_OVERLAY="${REPO_ROOT}/src/third_party/coreos-overlay"