luci-app-attendedsysupgrade: update status keys and messages

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>

diff --git a/applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js b/applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js
index 011215ca3cc7e9712af664ac8ca432e31053ff41..110b241be96b3f748f2b91d0dccc8ed8d44af174 100644 (file)
--- a/applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js
+++ b/applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js
@@ -60,11 +60,19 @@ function get_revision_count(revision) {
 
 return view.extend({
        steps: {
-               init: [10, _('Received build request')],
-               download_imagebuilder: [20, _('Downloading ImageBuilder archive')],
-               unpack_imagebuilder: [40, _('Setting Up ImageBuilder')],
-               calculate_packages_hash: [60, _('Validate package selection')],
-               building_image: [80, _('Generating firmware image')],
+               init:                    [  0, _('Received build request')],
+               container_setup:         [ 10, _('Setting up ImageBuilder')],
+               validate_revision:       [ 20, _('Validating revision')],
+               validate_manifest:       [ 30, _('Validating package selection')],
+               calculate_packages_hash: [ 40, _('Calculating package hash')],
+               building_image:          [ 50, _('Generating firmware image')],
+               signing_images:          [ 95, _('Signing images')],
+               done:                    [100, _('Completed generating firmware image')],
+               failed:                  [100, _('Failed to generate firmware image')],
+
+               /* Obsolete status values, retained for backward compatibility. */
+               download_imagebuilder:   [ 20, _('Downloading ImageBuilder archive')],
+               unpack_imagebuilder:     [ 40, _('Setting Up ImageBuilder')],
        },
 
        request_hash: '',