Revert "teuthology/schedule.py: update parsed_yaml with base_config"

This reverts commit 6c356472c37fc4334749d744738ff1ed4ebb031c.

This commit caused a regression: https://tracker.ceph.com/issues/71911

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

diff --git a/teuthology/suite/run.py b/teuthology/suite/run.py
index 0fc455057c793ca47ee3154490a8f845b2c059da..8115c4122ef891b85a7eeae1364d27a589f987e6 100644 (file)
--- a/teuthology/suite/run.py
+++ b/teuthology/suite/run.py
@@ -514,8 +514,6 @@ class Run(object):
                 '--',
             ])
             arg.extend(self.base_yaml_paths)
-            full_job_config = copy.deepcopy(self.base_config.to_dict())
-            deep_merge(parsed_yaml, full_job_config)
 
             parsed_yaml_txt = yaml.dump(parsed_yaml)
             arg.append('-')
@@ -531,7 +529,9 @@ class Run(object):
             sha1 = self.base_config.sha1
             if parsed_yaml.get('verify_ceph_hash',
                                config.suite_verify_ceph_hash):
-                flavor = util.get_install_task_flavor(parsed_yaml)
+                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: