From: Kyr Shatskyy <kyrylo.shatskyy@clyso.com>
Date: Thu, 30 Apr 2026 21:56:31 +0000 (+0200)
Subject: suite: fix order of yaml files overriding
X-Git-Tag: 1.3.0~9^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d63789af8b9bc7245be09fd5f0d75f343c3352ce;p=teuthology.git

suite: fix order of yaml files overriding

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>
---

diff --git a/teuthology/suite/run.py b/teuthology/suite/run.py
index ce3276a39..7b7923367 100644
--- a/teuthology/suite/run.py
+++ b/teuthology/suite/run.py
@@ -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,