[yocto] [auh][PATCH 16/21] upgradehelper.py: do not include testimage information in maintainer email messages

Alexander Kanavin alexander.kanavin at linux.intel.com
Thu Dec 21 08:27:24 PST 2017


There's some logic to ascribe failures to specific recipe upgrade commits; it's prone
to mismatches and is lacking context about what else was upgraded. Let's make testimage
support available for local maintainer use only - unattended mass-upgrades will not
try to run testimages.

Signed-off-by: Alexander Kanavin <alexander.kanavin at linux.intel.com>
---
 upgradehelper.py | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/upgradehelper.py b/upgradehelper.py
index 5659735..1170ca5 100755
--- a/upgradehelper.py
+++ b/upgradehelper.py
@@ -290,17 +290,6 @@ class Updater(object):
             "you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that\n" \
             "automatic upgrades would no longer be attempted.\n\n"
 
-        testimage_integration_error = \
-            "The recipe *FAILED* in testimage integration. Attached is the log file.\n\n"
-
-        testimage_ptest_info = \
-            "The recipe has ptest enabled and has been tested with core-image-minimal/ptest \n" \
-            "with the next machines %s. Attached is the log file.\n\n"
-
-        testimage_info = \
-            "The recipe has been tested using %s testimage and succeeded with \n" \
-            "the next machines %s. Attached is the log file.\n\n" \
-
         mail_footer = \
             "Please review the attached files for further information and build/update failures.\n" \
             "Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler\n\n" \
@@ -342,18 +331,6 @@ class Updater(object):
         if 'patch_file' in pkg_ctx and pkg_ctx['patch_file'] != None:
             msg_body += next_steps_info % (os.path.basename(pkg_ctx['patch_file']))
 
-        if self.opts['testimage']:
-            if 'integration_error' in pkg_ctx:
-                msg_body += testimage_integration_error
-            else:
-                if 'ptest' in pkg_ctx:
-                    machines = pkg_ctx['ptest'].keys()
-                    msg_body += testimage_ptest_info % machines
-                if 'testimage' in pkg_ctx:
-                    machines = pkg_ctx['testimage'].keys()
-                    msg_body += testimage_info % (settings.get('testimage_name', \
-                        DEFAULT_TESTIMAGE), machines)
-
         msg_body += mail_footer
 
         # Add possible attachments to email
-- 
2.15.1




More information about the yocto mailing list