From: Vallari Agrawal <val.agl002@gmail.com>
Date: Fri, 11 Jul 2025 14:16:22 +0000 (+0530)
Subject: Add flavor to job yaml (at Job creation)
X-Git-Tag: 1.2.2~13^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2065%2Fhead;p=teuthology.git

Add flavor to job yaml (at Job creation)

Currently, when creating jobs, paddles
does not get Job.flavor information.
This leads to "flavor" getting set only
after the job is completed.

This commit adds "flavor" to job yaml config
so Job.flavor is set when creating jobs.

Signed-off-by: Vallari Agrawal <val.agl002@gmail.com>
---

diff --git a/teuthology/suite/run.py b/teuthology/suite/run.py
index 347f6edb4..984231dfb 100644
--- a/teuthology/suite/run.py
+++ b/teuthology/suite/run.py
@@ -511,6 +511,12 @@ class Run(object):
             update_key('sha1', parsed_yaml, self.base_config) 
             update_key('suite_sha1', parsed_yaml, self.base_config) 
 
+            full_job_config = copy.deepcopy(self.base_config.to_dict())
+            deep_merge(full_job_config, parsed_yaml)
+            flavor = util.get_install_task_flavor(full_job_config)
+
+            parsed_yaml['flavor'] = flavor
+
             arg = copy.deepcopy(self.base_args)
             arg.extend([
                 '--num', str(self.args.num),
@@ -533,9 +539,6 @@ class Run(object):
             sha1 = self.base_config.sha1
             if parsed_yaml.get('verify_ceph_hash',
                                config.suite_verify_ceph_hash):
-                full_job_config = copy.deepcopy(self.base_config.to_dict())
-                deep_merge(full_job_config, parsed_yaml)
-                flavor = util.get_install_task_flavor(full_job_config)
                 version = util.package_version_for_hash(sha1, flavor, os_type,
                     os_version, self.args.machine_type)
                 if not version:
diff --git a/teuthology/suite/test/test_run_.py b/teuthology/suite/test/test_run_.py
index 3459e79ad..a3e6d12b3 100644
--- a/teuthology/suite/test/test_run_.py
+++ b/teuthology/suite/test/test_run_.py
@@ -342,6 +342,7 @@ class TestScheduleSuite(object):
           'timestamp',
           'user',
           'teuthology',
+          'flavor',
         ]
         for t in teuthology_keys:
             y[t] = ANY