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.

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

luci-app-attendedsysupgrade: update status keys and messages #7329

Merged
merged 1 commit into from
Oct 16, 2024

Conversation

efahl
Copy link
Contributor

@efahl efahl commented Oct 16, 2024

Maintainer: @aparcar
Tested on: x86/64 SNAPSHOT build

The reported status values have changed on the ASU server several times since the 'steps' list has been updated, so update it to include all possible values. Although some of the values in the list are no longer presented by the official OpenWrt ASU server, they may still be produced by other ASU servers, so leave them in for now.

Percentages have been adjusted based upon measurement of the build phases for several build configurations (ath79 vs x86, few packages vs many...). The numbers are still (very) rough estimates, but are more representative than the old values.

The reported status values have changed on the ASU server several
times since the 'steps' list has been updated, so update it to
include all possible values.  Although some of the values in the
list are no longer presented by the official OpenWrt ASU server, they
may still be produced by other ASU servers, so leave them in for now.

Percentages have been adjusted based up on measurement of the build
phases for several build configurations (ath79 vs x86, few packages
vs many...).  The numbers are still (very) rough estimates, but
are more representative than the old values.

Signed-off-by: Eric Fahlgren <ericfahlgren@gmail.com>
@dannil
Copy link
Contributor

dannil commented Oct 16, 2024

LGTM. I assume we should wait for openwrt/asu#1037 to be merged and deployed to sysupgrade.openwrt.org? Otherwise we'll break the LuCI app on SNAPSHOT.

EDIT: ignore above, I managed to miss that you kept the old statuses, should be good to go.

@efahl
Copy link
Contributor Author

efahl commented Oct 16, 2024

@dannil , thanks for looking at this.

I dug back through the ASU server revisions a couple months and couldn't find where those old status values were dropped, so we've been running without them for a while. But, I know ImmortalWrt is running an older version ASU server, so it might still be producing them and I wanted to let their server still work when they upgrade their LuCI app...

@aparcar
Copy link
Member

aparcar commented Oct 16, 2024

Should I merge this?

@dannil
Copy link
Contributor

dannil commented Oct 16, 2024

@dannil , thanks for looking at this.

I dug back through the ASU server revisions a couple months and couldn't find where those old status values were dropped, so we've been running without them for a while. But, I know ImmortalWrt is running an older version ASU server, so it might still be producing them and I wanted to let their server still work when they upgrade their LuCI app...

If they're dropped it should be fine, the only weirdness I could see was that with the new UI the unpack_imagebuilder status has the same progress percentage as the newly modified calculate_packages_hash, which meant that the progress bar would stay still moving from unpack_imagebuilder to calculate_packages_hash if you ran the new LuCI app and the old ASU server, but if they're already removed from ASU anyway before this then it's not a problem.

@aparcar aparcar merged commit 46fb560 into openwrt:master Oct 16, 2024
5 checks passed
@efahl efahl deleted the asu-app-update branch October 17, 2024 00:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants