File tree Expand file tree Collapse file tree 3 files changed +6
-13
lines changed Expand file tree Collapse file tree 3 files changed +6
-13
lines changed Original file line number Diff line number Diff line change 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.
3
3
4
4
if [[ ${1:- } = ' local' ]]; then
5
- local amd64_base_sysexts arm64_base_sysexts
5
+ local ciabs_base_sysexts
6
6
fi
7
7
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=(
14
9
' containerd-flatcar:app-containers/containerd'
15
10
' docker-flatcar:app-containers/docker'
16
11
)
Original file line number Diff line number Diff line change @@ -87,9 +87,8 @@ function _image_build_impl() {
87
87
apply_local_patches
88
88
89
89
source ci-automation/base_sysexts.sh ' local'
90
- local -n base_sysexts_ref=" ${arch} _base_sysexts"
91
90
local base_sysexts_param
92
- base_sysexts_param=$( export IFS=,; echo " ${base_sysexts_ref [*]} " )
91
+ base_sysexts_param=$( export IFS=,; echo " ${ciabs_base_sysexts [*]} " )
93
92
94
93
# build image and related artifacts
95
94
./run_sdk_container -x ./ci-cleanup.sh -n " ${image_container} " -C " ${packages_image} " \
Original file line number Diff line number Diff line change @@ -279,11 +279,10 @@ function get_base_sysext_list() {
279
279
local -n list_var_ref=${1} ; shift
280
280
281
281
source " ${scripts_repo} /ci-automation/base_sysexts.sh" ' local'
282
- local -n base_sysexts_ref=" ${arch} _base_sysexts"
283
282
284
283
list_var_ref=()
285
284
local entry
286
- for entry in " ${base_sysexts_ref [@]} " ; do
285
+ for entry in " ${ciabs_base_sysexts [@]} " ; do
287
286
list_var_ref+=( " ${entry%%:* } " )
288
287
done
289
288
}
You can’t perform that action at this time.
0 commit comments