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

ci-automation/base-sysexts: Simplify

Browse Source 
No need in making it arch-specific.
This commit is contained in:
Krzesimir Nowak 2023-11-21 15:59:20 +01:00
parent a87a8821fe
commit 3d4ddf8645
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ci-automation/base_sysexts.sh
View File

@ -1,16 +1,11 @@
# Definitions of base sysexts to be built, for each arch. Used by # Definitions of base sysexts to be built. Used by image.sh and
# image.sh and image_changes.sh. # image_changes.sh.
if [[ ${1:-} = 'local' ]]; then if [[ ${1:-} = 'local' ]]; then
local amd64_base_sysexts arm64_base_sysexts local ciabs_base_sysexts
fi fi
amd64_base_sysexts=( ciabs_base_sysexts=(
'containerd-flatcar:app-containers/containerd'
'docker-flatcar:app-containers/docker'
)
arm64_base_sysexts=(
'containerd-flatcar:app-containers/containerd' 'containerd-flatcar:app-containers/containerd'
'docker-flatcar:app-containers/docker' 'docker-flatcar:app-containers/docker'
) )

3
ci-automation/image.sh
View File

@ -87,9 +87,8 @@ function _image_build_impl() {
apply_local_patches apply_local_patches
source ci-automation/base_sysexts.sh 'local' source ci-automation/base_sysexts.sh 'local'
local -n base_sysexts_ref="${arch}_base_sysexts"
local base_sysexts_param local base_sysexts_param
base_sysexts_param=$(export IFS=,; echo "${base_sysexts_ref[*]}") base_sysexts_param=$(export IFS=,; echo "${ciabs_base_sysexts[*]}")
# build image and related artifacts # build image and related artifacts
./run_sdk_container -x ./ci-cleanup.sh -n "${image_container}" -C "${packages_image}" \ ./run_sdk_container -x ./ci-cleanup.sh -n "${image_container}" -C "${packages_image}" \

3
ci-automation/image_changes.sh
View File

@ -279,11 +279,10 @@ function get_base_sysext_list() {
local -n list_var_ref=${1}; shift local -n list_var_ref=${1}; shift
source "${scripts_repo}/ci-automation/base_sysexts.sh" 'local' source "${scripts_repo}/ci-automation/base_sysexts.sh" 'local'
local -n base_sysexts_ref="${arch}_base_sysexts"
list_var_ref=() list_var_ref=()
local entry local entry
for entry in "${base_sysexts_ref[@]}"; do for entry in "${ciabs_base_sysexts[@]}"; do
list_var_ref+=( "${entry%%:*}" ) list_var_ref+=( "${entry%%:*}" )
done done
} }