Skip to content

Commit 3d4ddf8

Browse files
committed
ci-automation/base-sysexts: Simplify
No need in making it arch-specific.
1 parent a87a882 commit 3d4ddf8

File tree

3 files changed

+6
-13
lines changed

3 files changed

+6
-13
lines changed

ci-automation/base_sysexts.sh

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
1-
# Definitions of base sysexts to be built, for each arch. Used by
2-
# image.sh and image_changes.sh.
1+
# Definitions of base sysexts to be built. Used by image.sh and
2+
# image_changes.sh.
33

44
if [[ ${1:-} = 'local' ]]; then
5-
local amd64_base_sysexts arm64_base_sysexts
5+
local ciabs_base_sysexts
66
fi
77

8-
amd64_base_sysexts=(
9-
'containerd-flatcar:app-containers/containerd'
10-
'docker-flatcar:app-containers/docker'
11-
)
12-
13-
arm64_base_sysexts=(
8+
ciabs_base_sysexts=(
149
'containerd-flatcar:app-containers/containerd'
1510
'docker-flatcar:app-containers/docker'
1611
)

ci-automation/image.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,8 @@ function _image_build_impl() {
8787
apply_local_patches
8888

8989
source ci-automation/base_sysexts.sh 'local'
90-
local -n base_sysexts_ref="${arch}_base_sysexts"
9190
local base_sysexts_param
92-
base_sysexts_param=$(export IFS=,; echo "${base_sysexts_ref[*]}")
91+
base_sysexts_param=$(export IFS=,; echo "${ciabs_base_sysexts[*]}")
9392

9493
# build image and related artifacts
9594
./run_sdk_container -x ./ci-cleanup.sh -n "${image_container}" -C "${packages_image}" \

ci-automation/image_changes.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,11 +279,10 @@ function get_base_sysext_list() {
279279
local -n list_var_ref=${1}; shift
280280

281281
source "${scripts_repo}/ci-automation/base_sysexts.sh" 'local'
282-
local -n base_sysexts_ref="${arch}_base_sysexts"
283282

284283
list_var_ref=()
285284
local entry
286-
for entry in "${base_sysexts_ref[@]}"; do
285+
for entry in "${ciabs_base_sysexts[@]}"; do
287286
list_var_ref+=( "${entry%%:*}" )
288287
done
289288
}

0 commit comments

Comments
 (0)