Change the job structure

Make the job easier to read
canonical · Mar 6, 2024 · 70d19b9 · 70d19b9
1 parent 5605d09
commit 70d19b9
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/.../checkbox-provider-ce-oem/units/strict-confinement/powermanagement-strict-confinement.pxu b/.../checkbox-provider-ce-oem/units/strict-confinement/powermanagement-strict-confinement.pxu
@@ -5,10 +5,6 @@ _description: This test will check your system shutdown/booting cycle via dbus c
 unit: job
 plugin: shell
 environ: STRESS_BOOT_WAKEUP_DELAY RTC_DEVICE_FILE
-command:
-  set -e
-  rtcwake -d "${RTC_DEVICE_FILE:-rtc0}" -v -m on -s "${STRESS_BOOT_WAKEUP_DELAY:-120}" &
-  test-strict-confinement.cold-boot
 user: root
 flags: preserve-locale noreturn autorestart
 estimated_duration: 180.0
@@ -18,6 +14,10 @@ imports:
 requires:
   lsb.distributor_id == 'Ubuntu Core'
   snap.name == 'test-strict-confinement'
+command:
+  set -e
+  rtcwake -d "${RTC_DEVICE_FILE:-rtc0}" -v -m on -s "${STRESS_BOOT_WAKEUP_DELAY:-120}" &
+  test-strict-confinement.cold-boot
 
 
 id: dbus-cold-boot-test
@@ -27,12 +27,12 @@ _description: This is a job to check system bootup without error after cold rebo
 unit: job
 plugin: shell
 environ: LD_LIBRARY_PATH
-command:
-  reboot_check_test.sh -c "$PLAINBOX_SESSION_SHARE/before_reboot" -d "$PLAINBOX_SESSION_SHARE/cold_reboot" -s -f
 user: root
 flags: preserve-locale
 estimated_duration: 1.0
 depends: dbus-cold-boot-reboot
+command:
+  reboot_check_test.sh -c "$PLAINBOX_SESSION_SHARE/before_reboot" -d "$PLAINBOX_SESSION_SHARE/cold_reboot" -s -f
 
 
 id: dbus-warm-boot-reboot
@@ -41,8 +41,6 @@ _summary: Perform warm reboot via dbus
 _description: Perform warm reboot of the system via dbus command.
 unit: job
 plugin: shell
-command:
-  test-strict-confinement.warm-boot
 user: root
 flags: preserve-locale noreturn autorestart
 estimated_duration: 60s
@@ -52,6 +50,8 @@ imports:
 requires:
   lsb.distributor_id == 'Ubuntu Core'
   snap.name == 'test-strict-confinement'
+command:
+  test-strict-confinement.warm-boot
 
 
 id: dbus-warm-boot-test
@@ -61,9 +61,9 @@ _description: This is a job to check system bootup without error after warm rebo
 unit: job
 plugin: shell
 environ: LD_LIBRARY_PATH
-command:
-  reboot_check_test.sh -c "$PLAINBOX_SESSION_SHARE/before_reboot" -d "$PLAINBOX_SESSION_SHARE/warm_reboot" -s -f
 user: root
 flags: preserve-locale
 estimated_duration: 1.0
 depends: dbus-warm-boot-reboot
+command:
+  reboot_check_test.sh -c "$PLAINBOX_SESSION_SHARE/before_reboot" -d "$PLAINBOX_SESSION_SHARE/warm_reboot" -s -f