trunner: add reboot property in yaml

JIRA CI-303

trunner/config.py

@@ -43,6 +43,7 @@ class ConfigParser:
     class MainConfig:
         targets: Optional[Set] = None
         type: Optional[str] = None
+        reboot: bool = False
         ignore: bool = False
         nightly: bool = False
 
@@ -169,6 +170,14 @@ def _parse_shell_command(self, config: dict):
             cmd=parsed_cmd,
         )
 
+    def _parse_reboot(self, config: dict) -> None:
+        reboot = config.get("reboot", self.main.reboot)
+
+        if not isinstance(reboot, bool):
+            raise ParserError(f"reboot must be a boolean value (true/false) not {reboot}")
+
+        self.test.reboot = reboot
+
     def _parse_ignore(self, config: dict) -> None:
         ignore = config.get("ignore", self.main.ignore)
 
@@ -248,6 +257,7 @@ def _parse_config(self, config: dict):
         if self.test.ignore:
             return
 
+        self._parse_reboot(config)
         self._parse_shell_command(config)
         self._parse_load(config)
         self._parse_kwargs(config)

trunner/target/armv7a9.py

@@ -97,7 +97,7 @@ def flash_dut(self):
     def build_test(self, test: TestOptions) -> Callable[[], Optional[TestResult]]:
         builder = HarnessBuilder()
 
-        if test.should_reboot:
+        if test.reboot:
             builder.add(RebooterHarness(self.rebooter))
 
         if test.shell is not None:

trunner/target/armv7m7.py

@@ -74,7 +74,7 @@ def flash_dut(self):
     def build_test(self, test: TestOptions) -> Callable[[], Optional[TestResult]]:
         builder = HarnessBuilder()
 
-        if test.should_reboot:
+        if test.reboot:
             builder.add(RebooterHarness(self.rebooter, hard=False))
 
         if test.bootloader is not None:
@@ -114,6 +114,6 @@ class IMXRT117xEvkTarget(IMXTarget):
 
     def build_test(self, test: TestOptions) -> Callable[[], Optional[TestResult]]:
         # FIXME due to https://github.com/phoenix-rtos/phoenix-rtos-project/issues/580 always reboot
-        test.should_reboot = True
+        test.reboot = True
 
         return super().build_test(test)

trunner/target/emulated.py

@@ -36,7 +36,7 @@ def flash_dut(self):
     def build_test(self, test: TestOptions) -> Callable[[], Optional[TestResult]]:
         builder = HarnessBuilder()
 
-        if test.should_reboot:
+        if test.reboot:
             builder.add(RebooterHarness(self.rebooter))
 
         if test.shell is not None:

trunner/test_runner.py

@@ -156,6 +156,8 @@ def run_tests(self, tests: Sequence[TestOptions]):
         """
 
         fail, skip = 0, 0
+        # Reboot is required for the initial test.
+        tests[0].reboot = True
 
         for idx, test in enumerate(tests):
             result = TestResult(test.name)
@@ -191,17 +193,16 @@ def run_tests(self, tests: Sequence[TestOptions]):
             def set_reboot_flag(tests, idx, result):
                 # If the test is successful and the next test doesn't require loading via
                 # the plo we don't want to reboot the entire device (to speed up the test execution).
-                # There are three exceptions to this rule:
+                # There are four exceptions to this rule:
+                # 0. The yaml config has been configured with the reboot parameter set to True.
                 # 1. Runner runs in the "nightly" mode when we are not concerned about slow execution.
                 # 2. The test has failed.
                 # 3. We have to enter the bootloader in order to load applications.
                 if idx == len(tests) - 1:
                     return
 
-                tests[idx + 1].should_reboot = False
-
                 if result.is_skip():
-                    tests[idx + 1].should_reboot = tests[idx].should_reboot
+                    tests[idx + 1].reboot = tests[idx].reboot
 
                 if (
                     result.is_fail()
@@ -212,7 +213,7 @@ def set_reboot_flag(tests, idx, result):
                         and tests[idx + 1].bootloader.apps
                     )
                 ):
-                    tests[idx + 1].should_reboot = True
+                    tests[idx + 1].reboot = True
 
             set_reboot_flag(tests, idx, result)
 

trunner/types.py

@@ -208,7 +208,7 @@ class TestOptions:
     target: Optional[str] = None
     bootloader: Optional[BootloaderOptions] = None
     shell: Optional[ShellOptions] = None
-    should_reboot: bool = True
+    reboot: bool = False
     ignore: bool = False
     nightly: bool = False
     kwargs: Dict = field(default_factory=dict)