]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
suite: fix order of yaml files overriding
authorKyr Shatskyy <kyrylo.shatskyy@clyso.com>
Thu, 30 Apr 2026 21:56:31 +0000 (23:56 +0200)
committerKyr Shatskyy <kyrylo.shatskyy@clyso.com>
Fri, 8 May 2026 20:14:47 +0000 (22:14 +0200)
For correct overrides which can be provided in extra yaml arguments
to teuthology-suites the joined yaml of job_config from suite directory
must go first in order.

Fixes: 96f38f2136dd2a4f64cc741919b85dc65a9df536
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@clyso.com>
teuthology/suite/run.py

index ce3276a39742554d3376eb4d68e31fb73368582c..7b7923367e14516d6a32555a7c3d2b847a0f0b12 100644 (file)
@@ -507,10 +507,11 @@ class Run(object):
                 '--description', description,
                 '--',
             ])
-            arg.extend(self.base_yaml_paths)
-
-            parsed_yaml_txt = yaml.dump(parsed_yaml)
+            # In order overriding with extra yaml paths could possibly work,
+            # order parsed yaml before base_yaml_paths
             arg.append('-')
+            parsed_yaml_txt = yaml.dump(parsed_yaml)
+            arg.extend(self.base_yaml_paths)
 
             job = dict(
                 yaml=parsed_yaml,