Merge remote-tracking branch 'apahim/fix_replay_execution_order'

Signed-off-by: NCleber Rosa <crosa@redhat.com>

avocado/plugins/replay.py

@@ -209,7 +209,8 @@ class Replay(CLI):
                      'external_runner_testdir',
                      'external_runner_chdir',
                      'failfast',
-                     'ignore_missing_references']
+                     'ignore_missing_references',
+                     'execution_order']
         if replay_args is None:
             LOG_UI.warn('Source job args data not found. These options will '
                         'not be loaded in this replay job: %s',

avocado/plugins/run.py

@@ -99,7 +99,7 @@ class Run(CLICmd):
                             "system information (hardware details, profilers, "
                             "etc.). Current:  %(default)s")
 
-        parser.add_argument("--execution-order", default="variants-per-test",
+        parser.add_argument("--execution-order",
                             choices=("tests-per-variant",
                                      "variants-per-test"),
                             help="Defines the order of iterating through test "

optional_plugins/html/avocado_result_html/__init__.py

@@ -267,12 +267,15 @@ class HTMLResult(Result):
 
         open_browser = getattr(job.args, 'open_browser', False)
         if getattr(job.args, 'html_job_result', 'off') == 'on':
-            html_dir = os.path.join(job.logdir, 'html')
-            if os.path.exists(html_dir):    # update the html result if exists
-                shutil.rmtree(html_dir)
-            os.makedirs(html_dir)
-            html_path = os.path.join(html_dir, 'results.html')
+            # FIXME: remove html legacy dir after 52.0 LTS release
+            html_legacy_dir = os.path.join(job.logdir, 'html')
+            if os.path.exists(html_legacy_dir):    # update the html result if exists
+                shutil.rmtree(html_legacy_dir)
+            html_path = os.path.join(job.logdir, 'results.html')
             self._render(result, html_path)
+            os.makedirs(html_legacy_dir)
+            os.symlink(os.path.join(os.path.pardir, 'results.html'),
+                       os.path.join(html_legacy_dir, 'results.html'))
             if getattr(job.args, 'stdout_claimed_by', None) is None:
                 LOG_UI.info("JOB HTML   : %s", html_path)
             if open_browser: