Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Chore] tools.images_packer: refine previous offline_ota_image_builder to support 2 image packing mode #267

Merged
merged 17 commits into from
Dec 26, 2023
Merged

[Chore] tools.images_packer: refine previous offline_ota_image_builder to support 2 image packing mode #267

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e3e573f
tools: rename offline_ota_image_builder to image_packer
Bodong-Yang Dec 25, 2023
02c4399
tools.images_packer: layout the subcommands
Bodong-Yang Dec 25, 2023
5592763
tools.images_packer: implement subcommand handler for build_cache_src
Bodong-Yang Dec 25, 2023
ffecddd
minor update
Bodong-Yang Dec 25, 2023
a964442
tools.images_packer: check over write_to_dev is performed before imag…
Bodong-Yang Dec 25, 2023
d0555d8
list -o args for each subcommands
Bodong-Yang Dec 25, 2023
7e2c77b
update README.md
Bodong-Yang Dec 25, 2023
6141adb
minor update to README.md
Bodong-Yang Dec 25, 2023
6214184
fix image specifying args
Bodong-Yang Dec 25, 2023
b3f0f3e
minor fix
Bodong-Yang Dec 25, 2023
d5416d0
use images_packer as tmp prefix
Bodong-Yang Dec 25, 2023
a9edc6b
images_packer.build_offline_ota_imgs_bundle: add a check for multiple…
Bodong-Yang Dec 26, 2023
9abd24f
update README.md
Bodong-Yang Dec 26, 2023
707857c
add bash script for external cache
obi-t4 Dec 26, 2023
ced541c
Merge branch 'refine/ota_image_bundle' of github.com:tier4/ota-client…
obi-t4 Dec 26, 2023
786ef4d
explicitly reject setting multiple OTA target image to the same ECU
Bodong-Yang Dec 26, 2023
a13f3bb
update usage
Bodong-Yang Dec 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion tools/images_packer/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,13 @@ def main_build_offline_ota_image_bundle(args: argparse.Namespace):
image_version=_image_version,
)
)
if _ecu_id in image_files:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should not be warning. For the user, this is the unexpected behavior, so it should be error.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes I agree! This is unexpected behavior. Let me fix it.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated at 786ef4d, now multiple images specified to the same ECU will cause the images_packer logging an error and then exit.

logger.warning(
(
f"override previously set OTA target image for ECU@{_ecu_id} "
f"from {image_files[_ecu_id]} to {_image_fpath}"
)
)
image_files[_ecu_id] = _image_fpath
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

_ecu_id key must be checked if the key already exists.

Copy link
Member Author

@Bodong-Yang Bodong-Yang Dec 26, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated at a9edc6b. If same ECU has multiple target OTA image being specified, a warning log will be issued, and later setting will override the previous one.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ota-client/tools/images_packer/__main__.py

Lines 72 to 79 in a9edc6b

if _ecu_id in image_files:
logger.warning(
(
f"override previously set OTA target image for ECU@{_ecu_id} "
f"from {image_files[_ecu_id]} to {_image_fpath}"
)
)
image_files[_ecu_id] = _image_fpath

else:
logger.warning(f"ignore illegal image pair: {raw_pair}")
Expand Down Expand Up @@ -233,7 +240,9 @@ def command_build_offline_ota_image_bundle(
"--image",
help=(
"OTA image for <ECU_ID> as tar archive(compressed or uncompressed), "
"this option can be used multiple times to include multiple images."
"this option can be used multiple times to include multiple images. \n"
"NOTE: if multiple OTA target image is specified for the same ECU, the later one "
"will override the previous set one."
),
required=True,
metavar="<ECU_NAME>:<IMAGE_PATH>[:<IMAGE_VERSION>]",
Expand Down