mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-07 21:16:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

common: add support for using COREOS_BUILD_ID from the environment

Browse Source 
This allows build systems to export COREOS_BUILD_ID, making it practical
to map built images to the job that created them.
This commit is contained in:
Michael Marineau 2015-11-30 09:29:24 -08:00
parent 39a3a48a18
commit 0b6acf8605
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
common.sh
View File

@ -219,11 +219,8 @@ get_gclient_root() {
# Populate the ENVIRONMENT_WHITELIST array. # Populate the ENVIRONMENT_WHITELIST array.
load_environment_whitelist() { load_environment_whitelist() {
ENVIRONMENT_WHITELIST=( ENVIRONMENT_WHITELIST=(
CHROMEOS_OFFICIAL COREOS_BUILD_ID
CHROMEOS_VERSION_AUSERVER COREOS_OFFICIAL
CHROMEOS_VERSION_DEVSERVER
CHROMEOS_VERSION_TRACK
GCC_GITHASH
GIT_AUTHOR_EMAIL GIT_AUTHOR_EMAIL
GIT_AUTHOR_NAME GIT_AUTHOR_NAME
GIT_COMMITTER_EMAIL GIT_COMMITTER_EMAIL
@ -244,6 +241,13 @@ load_environment_whitelist() {
) )
} }
load_environment_var() {
local file="$1" name="$2"
local value
value=$(grep "^${name}=" "${file}")
export "${value}"
}
# Find root of source tree # Find root of source tree
get_gclient_root get_gclient_root
@ -267,23 +271,22 @@ BUILD_LIBRARY_DIR="${SCRIPTS_DIR}/build_library"
REPO_CACHE_DIR="${REPO_ROOT}/.cache" REPO_CACHE_DIR="${REPO_ROOT}/.cache"
REPO_MANIFESTS_DIR="${REPO_ROOT}/.repo/manifests" REPO_MANIFESTS_DIR="${REPO_ROOT}/.repo/manifests"
# Source COREOS_* from manifest for version information. # Source COREOS_VERSION_ID from manifest.
COREOS_VERSION_FILE="${REPO_MANIFESTS_DIR}/version.txt" if [[ -f "${REPO_MANIFESTS_DIR}/version.txt" ]]; then
if [[ ! -f "${COREOS_VERSION_FILE}" ]]; then load_environment_var "${REPO_MANIFESTS_DIR}/version.txt" COREOS_VERSION_ID
COREOS_VERSION_FILE="${SCRIPT_LOCATION}/version.txt" # The build id may be provided externally by the build system.
: ${COREOS_BUILD_ID:=$(date +%Y-%m-%d-%H%M)}
elif [[ -f "${SCRIPT_LOCATION}/version.txt" ]]; then
load_environment_var "${SCRIPT_LOCATION}/version.txt" COREOS_VERSION_ID
# This only happens in update.zip where we must use the current build id.
load_environment_var "${SCRIPT_LOCATION}/version.txt" COREOS_BUILD_ID
else
die "Unable to locate version.txt"
fi fi
source "$COREOS_VERSION_FILE" || die "Cannot source version.txt"
# Set version based on old variables if undefined
: ${COREOS_VERSION_ID:=${COREOS_BUILD}.${COREOS_BRANCH}.${COREOS_PATCH}}
# Official builds must set COREOS_OFFICIAL=1 to use an official version. # Official builds must set COREOS_OFFICIAL=1 to use an official version.
# Unofficial builds always appended the date/time as a build identifier. # Unofficial builds always appended the build identifier.
# Also do not alter the version if using an alternate version.txt path. if [[ ${COREOS_OFFICIAL:-0} -ne 1 && -n "${COREOS_BUILD_ID}" ]]; then
COREOS_BUILD_ID=""
if [[ ${COREOS_OFFICIAL:-0} -ne 1 &&
"${COREOS_VERSION_FILE}" =~ /\.repo/manifests/version.txt ]]; then
COREOS_BUILD_ID=$(date +%Y-%m-%d-%H%M)
COREOS_VERSION="${COREOS_VERSION_ID}+${COREOS_BUILD_ID}" COREOS_VERSION="${COREOS_VERSION_ID}+${COREOS_BUILD_ID}"
else else
COREOS_VERSION="${COREOS_VERSION_ID}" COREOS_VERSION="${COREOS_VERSION_ID}"