Skip to content

Commit 0c7d6d9

Browse files
phlogistonjohnmergify[bot]
authored andcommitted
common: install sambacc extra packages from local dir if present
The install-sambacc-common.sh script retains the method of installing sambacc RPMs (and even python wheels) from earlier build processes even though it's not the default install method now. It still is useful when developing sambacc features. Now, sambacc has extra packages that mainly act to provide python extras for features like yaml, toml and jsonschema validation. Install these files if the are present but retain the logic that there should only be on "main" sambacc rpm. Signed-off-by: John Mulligan <[email protected]>
1 parent f5374a8 commit 0c7d6d9

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

images/common/install-sambacc-common.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ install_sambacc() {
1212

1313
local wheels=()
1414
local rpmfiles=()
15+
local rpmextras=()
1516
local repofiles=()
1617
for artifact in "${artifacts[@]}" ; do
1718
if [[ ${artifact} =~ sambacc.*\.whl$ ]]; then
@@ -20,6 +21,9 @@ install_sambacc() {
2021
if [[ ${artifact} =~ python.?-sambacc-.*\.noarch\.rpm$ ]]; then
2122
rpmfiles+=("${artifact}")
2223
fi
24+
if [[ ${artifact} =~ python.?-sambacc+.*\.noarch\.rpm$ ]]; then
25+
rpmextras+=("${artifact}")
26+
fi
2327
if [[ ${artifact} =~ sambacc.*\.repo$ ]]; then
2428
repofiles+=("${artifact}")
2529
fi
@@ -59,7 +63,7 @@ install_sambacc() {
5963
container_json_file="/usr/local/share/sambacc/examples/${DEFAULT_JSON_FILE}"
6064
;;
6165
install-rpm)
62-
dnf install -y "${rpmfiles[0]}"
66+
dnf install -y "${rpmfiles[0]}" "${rpmextras[@]}"
6367
dnf clean all
6468
container_json_file="/usr/share/sambacc/examples/${DEFAULT_JSON_FILE}"
6569
;;

0 commit comments

Comments
 (0)