mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-11-14 07:01:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #333 from flatcar-linux/kai/push-versionfile-early

Browse Source 
ci-automation: Push version file early
This commit is contained in:
Kai Lüke 2022-05-24 17:41:42 +09:00 committed by GitHub
commit c9089cf8d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ci-automation/packages.sh
View File

@ -122,6 +122,13 @@ function packages_build() {
local docker_vernum="$(vernum_to_docker_image_version "${vernum}")" local docker_vernum="$(vernum_to_docker_image_version "${vernum}")"
local packages_container="flatcar-packages-${arch}-${docker_vernum}" local packages_container="flatcar-packages-${arch}-${docker_vernum}"
# Create version file
(
source sdk_lib/sdk_container_common.sh
create_versionfile "$sdk_version" "$version"
)
update_and_push_version "${version}" "${push_branch}"
# Build packages; store packages and torcx output in container # Build packages; store packages and torcx output in container
./run_sdk_container -x ./ci-cleanup.sh -n "${packages_container}" -v "${version}" \ ./run_sdk_container -x ./ci-cleanup.sh -n "${packages_container}" -v "${version}" \
-C "${sdk_image}" \ -C "${sdk_image}" \
@ -154,7 +161,5 @@ function packages_build() {
"${torcx_tmp}/torcx/${arch}-usr/latest/torcx_manifest.json" "${torcx_tmp}/torcx/${arch}-usr/latest/torcx_manifest.json"
copy_to_buildcache "images/${arch}/${vernum}/torcx" \ copy_to_buildcache "images/${arch}/${vernum}/torcx" \
"${torcx_tmp}/torcx/pkgs/${arch}-usr/docker/"*/*.torcx.tgz "${torcx_tmp}/torcx/pkgs/${arch}-usr/docker/"*/*.torcx.tgz
update_and_push_version "${version}" "${push_branch}"
} }
# -- # --

21
ci-automation/sdk_bootstrap.sh
View File

@ -53,8 +53,8 @@ set -eu
function sdk_bootstrap() { function sdk_bootstrap() {
local seed_version="$1" local seed_version="$1"
local version="$2" local version="$2"
local coreos_git="$3" local coreos_git="${3-}"
local portage_git="$4" local portage_git="${4-}"
: ${ARCH:="amd64"} : ${ARCH:="amd64"}
source ci-automation/ci_automation_common.sh source ci-automation/ci_automation_common.sh
@ -100,18 +100,23 @@ function sdk_bootstrap() {
local vernum="${version#*-}" # remove alpha-,beta-,stable-,lts- version tag local vernum="${version#*-}" # remove alpha-,beta-,stable-,lts- version tag
local git_vernum="${vernum}" local git_vernum="${vernum}"
# This will update FLATCAR_VERSION[_ID] and BUILD_ID in versionfile # Update FLATCAR_VERSION[_ID], BUILD_ID, and SDK in versionfile
(
source sdk_lib/sdk_container_common.sh
create_versionfile "${vernum}"
)
update_and_push_version "${version}" "${push_branch}"
./bootstrap_sdk_container -x ./ci-cleanup.sh "${seed_version}" "${vernum}" ./bootstrap_sdk_container -x ./ci-cleanup.sh "${seed_version}" "${vernum}"
# push SDK tarball to buildcache # push SDK tarball to buildcache
# Get Flatcar version number format (separator is '+' instead of '-',
# equal to $(strip_version_prefix "$version")
source sdk_container/.repo/manifests/version.txt source sdk_container/.repo/manifests/version.txt
local vernum="${FLATCAR_SDK_VERSION}" local dest_tarball="flatcar-sdk-${ARCH}-${FLATCAR_SDK_VERSION}.tar.bz2"
local dest_tarball="flatcar-sdk-${ARCH}-${vernum}.tar.bz2"
cd "__build__/images/catalyst/builds/flatcar-sdk" cd "__build__/images/catalyst/builds/flatcar-sdk"
copy_to_buildcache "sdk/${ARCH}/${vernum}" "${dest_tarball}"* copy_to_buildcache "sdk/${ARCH}/${FLATCAR_SDK_VERSION}" "${dest_tarball}"*
cd - cd -
update_and_push_version "${version}" "${push_branch}"
} }
# -- # --