diff --git a/ci-automation/base_sysexts.sh b/ci-automation/base_sysexts.sh index 7c58d574b1..d5afeac5ea 100644 --- a/ci-automation/base_sysexts.sh +++ b/ci-automation/base_sysexts.sh @@ -1,16 +1,11 @@ -# Definitions of base sysexts to be built, for each arch. Used by -# image.sh and image_changes.sh. +# Definitions of base sysexts to be built. Used by image.sh and +# image_changes.sh. if [[ ${1:-} = 'local' ]]; then - local amd64_base_sysexts arm64_base_sysexts + local ciabs_base_sysexts fi -amd64_base_sysexts=( - 'containerd-flatcar:app-containers/containerd' - 'docker-flatcar:app-containers/docker' -) - -arm64_base_sysexts=( +ciabs_base_sysexts=( 'containerd-flatcar:app-containers/containerd' 'docker-flatcar:app-containers/docker' ) diff --git a/ci-automation/image.sh b/ci-automation/image.sh index 5f9c9c252f..139956970c 100644 --- a/ci-automation/image.sh +++ b/ci-automation/image.sh @@ -87,9 +87,8 @@ function _image_build_impl() { apply_local_patches source ci-automation/base_sysexts.sh 'local' - local -n base_sysexts_ref="${arch}_base_sysexts" 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 ./run_sdk_container -x ./ci-cleanup.sh -n "${image_container}" -C "${packages_image}" \ diff --git a/ci-automation/image_changes.sh b/ci-automation/image_changes.sh index a036d52a89..372c2d0819 100644 --- a/ci-automation/image_changes.sh +++ b/ci-automation/image_changes.sh @@ -279,11 +279,10 @@ function get_base_sysext_list() { local -n list_var_ref=${1}; shift source "${scripts_repo}/ci-automation/base_sysexts.sh" 'local' - local -n base_sysexts_ref="${arch}_base_sysexts" list_var_ref=() local entry - for entry in "${base_sysexts_ref[@]}"; do + for entry in "${ciabs_base_sysexts[@]}"; do list_var_ref+=( "${entry%%:*}" ) done }