From 2244a6b600fe78709109f3ed4cc10410e5f7588a Mon Sep 17 00:00:00 2001
From: Patrick Liu <patrick.liu@canonical.com>
Date: Thu, 4 Mar 2021 12:02:12 +0800
Subject: fix typo and make some steps more specific

---
 units/snapd/snapd.pxu     |  4 ++--
 units/ubuntucore/jobs.pxu | 32 ++++++++++++++++++--------------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/units/snapd/snapd.pxu b/units/snapd/snapd.pxu
index b7ca202..65cf5a8 100644
--- a/units/snapd/snapd.pxu
+++ b/units/snapd/snapd.pxu
@@ -199,7 +199,7 @@ _steps:
  5. Remove reverted version (and associated data) to make system clean
     snap remove core --revision=<edge_revision>
 _verification:
- Check core version at step4 is back to its stable version
+ Check core version at step 4 is back to its stable version
 plugin: manual
 depends: snappy/os-refresh
 category_id: snapd
@@ -221,7 +221,7 @@ _steps:
  5. Remove reverted version (and associated data) to make system clean
     snap remove core --revision=<edge_revision>
 _verification:
- Check core version at step4 is back to its stable version
+ Check core version at step 4 is back to its stable version
 plugin: manual
 depends: snappy/os-refresh-with-refresh-control
 category_id: snapd
diff --git a/units/ubuntucore/jobs.pxu b/units/ubuntucore/jobs.pxu
index 01f6945..27b3dee 100644
--- a/units/ubuntucore/jobs.pxu
+++ b/units/ubuntucore/jobs.pxu
@@ -55,20 +55,22 @@ _summary: Automatically rollback after failed boot after upgrade
 _purpose:
  Check system will rollback to original core snap if failed to boot the updated one
 _steps:
- 1. Update to edge. 
+ 1. Check the current revision of core<version>
+    $ snap list core<version>
+ 2. Update to edge. 
     Note that system will automatically reboot in 1 minute after doing this command.
-    Please execute the command in step4 in 1 minute to stop the automatic reboot.
+    Please execute the command in step 3 in 1 minute to stop the automatic reboot.
     $ sudo snap refresh core<version> --edge
- 2. Cancel the automatic shutdown
+ 3. Cancel the automatic shutdown
     $ sudo shutdown -c
- 3. Simulate a failed boot by the following command
+ 4. Simulate a failed boot by the following command
     $ sudo sed -i 's/base_status=try/base_status=trying/' /var/lib/snapd/modeenv
- 4. Reboot the system and log in
+ 5. Reboot the system and log in
     $ sudo reboot
- 5. Check the version number
+ 6. Check the revision of core<version> again
     $ snap list core<version>
 _verification:
- Check system is currently booting the stable core version
+ Check system is still booting the stable core version (original revision)
 plugin: manual
 category_id: ubuntucore
 estimated_duration: 500
@@ -78,20 +80,22 @@ _summary: Automatically rollback after failed boot after upgrade
 _purpose:
  Check system will rollback to original core snap if failed to boot the updated one
 _steps:
- 1. Update to edge.
+ 1. Check the current revision of core<version>
+    $ snap list core<version>
+ 2. Update to edge.
     Note that system will automatically reboot in 1 minute after doing this command.
-    Please execute the command in step4 in 1 minute to stop the automatic reboot.
+    Please execute the command in step 3 in 1 minute to stop the automatic reboot.
     $ sudo snap refresh core<version> --edge --ignore-validation
- 2. Cancel the automatic shutdown
+ 3. Cancel the automatic shutdown
     $ sudo shutdown -c
- 3. Simulate a failed boot by the following command
+ 4. Simulate a failed boot by the following command
     $ sudo sed -i 's/base_status=try/base_status=trying/' /var/lib/snapd/modeenv
- 4. Reboot the system and log in
+ 5. Reboot the system and log in
     $ sudo reboot
- 5. Check the version number
+ 6. Check the revision of core<version> again
     $ snap list core<version>
 _verification:
- Check system is currently booting the stable core version
+ Check system is still booting the stable core version (original revision)
 plugin: manual
 category_id: ubuntucore
 estimated_duration: 500
-- 
cgit v1.2.3