From: Zack Cerza <zack@redhat.com>
Date: Mon, 13 Mar 2023 16:54:38 +0000 (-0600)
Subject: suite.merge.config_merge: Skip empty postmerge
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=03fd76a36f45a4aa56b98dc4b5216d6ad8fe95ca;p=teuthology.git

suite.merge.config_merge: Skip empty postmerge

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/teuthology/suite/merge.py b/teuthology/suite/merge.py
index 647fe6e1d..b46a0434b 100644
--- a/teuthology/suite/merge.py
+++ b/teuthology/suite/merge.py
@@ -154,17 +154,18 @@ def config_merge(configs, suite_name=None, **kwargs):
             deep_merge(yaml_complete_obj, yaml_fragment_obj)
 
         postmerge = yaml_complete_obj.get('teuthology', {}).get('postmerge', [])
-        postmerge = "\n".join(postmerge)
-        log.debug("postmerge script running:\n%s", postmerge)
-        env, script = new_script(postmerge, log, deep_merge, yaml.safe_load)
-        env['base_frag_paths'] = [strip_fragment_path(x) for x in paths]
-        env['description'] = desc
-        env['frag_paths'] = paths
-        env['suite_name'] = suite_name
-        env['yaml'] = yaml_complete_obj
-        for k,v in kwargs.items():
-            env[k] = v
-        if not script():
-            log.debug("skipping config %s due to postmerge filter", desc)
-            continue
+        if postmerge:
+            postmerge = "\n".join(postmerge)
+            log.debug("postmerge script running:\n%s", postmerge)
+            env, script = new_script(postmerge, log, deep_merge, yaml.safe_load)
+            env['base_frag_paths'] = [strip_fragment_path(x) for x in paths]
+            env['description'] = desc
+            env['frag_paths'] = paths
+            env['suite_name'] = suite_name
+            env['yaml'] = yaml_complete_obj
+            for k, v in kwargs.items():
+                env[k] = v
+            if not script():
+                log.debug("skipping config %s due to postmerge filter", desc)
+                continue
         yield desc, paths, yaml_complete_obj