Patchwork [bitbake-devel,11/94] bitbake: webhob: changes to build information table

login
register
mail settings
Submitter Alexandru DAMIAN
Date Sept. 24, 2013, 4:51 p.m.
Message ID <92aa0e5d0233ab5c5dbd3a03b92dd05c97d9a4f7.1380041477.git.alexandru.damian@intel.com>
Download mbox | patch
Permalink /patch/58867/
State New
Headers show

Comments

Alexandru DAMIAN - Sept. 24, 2013, 4:51 p.m.
From: Calin Dragomir <calinx.l.dragomir@intel.com>

It was decided that disk_io and cpu usage information are not very
relevant for a full build, so these fields have been droped from
our models and replaced with output information (image_fstypes field)

Signed-off-by: Calin Dragomir <calinx.l.dragomir@intel.com>
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
---
 bitbake/lib/bb/ui/buildinfohelper.py              | 6 ++----
 bitbake/lib/webhob/bldviewer/templates/build.html | 6 ++----
 bitbake/lib/webhob/orm/models.py                  | 3 +--
 3 files changed, 5 insertions(+), 10 deletions(-)

Patch

diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py
index 57e404b..e1ebd41 100644
--- a/bitbake/lib/bb/ui/buildinfohelper.py
+++ b/bitbake/lib/bb/ui/buildinfohelper.py
@@ -47,8 +47,7 @@  class ORMWrapper(object):
         build_info['outcome'] = 0
         build_info['number_of_errors'] = 0
         build_info['number_of_warnings'] = 0
-        build_info['cpu_usage'] = 0
-        build_info['disk_io'] = 0
+        build_info['image_fstypes'] = server.runCommand(["getVariable", "IMAGE_FSTYPES"])[0]
         build_info['cooker_log_path'] = server.runCommand(["getVariable", "BB_CONSOLELOG"])[0]
         build_info['build_name'] = server.runCommand(["getVariable", "BUILDNAME"])[0]
         build_info['bitbake_version'] = server.runCommand(["getVariable", "BB_VERSION"])[0]
@@ -69,8 +68,7 @@  class ORMWrapper(object):
                                     outcome=build_info['outcome'],
                                     errors_no=build_info['number_of_errors'],
                                     warnings_no=build_info['number_of_warnings'],
-                                    cpu_usage=build_info['cpu_usage'],
-                                    disk_io=build_info['disk_io'],
+                                    image_fstypes=build_info['image_fstypes'],
                                     cooker_log_path=build_info['cooker_log_path'],
                                     build_name=build_info['build_name'],
                                     bitbake_version=build_info['bitbake_version'])
diff --git a/bitbake/lib/webhob/bldviewer/templates/build.html b/bitbake/lib/webhob/bldviewer/templates/build.html
index 9a2d412..1b694d6 100644
--- a/bitbake/lib/webhob/bldviewer/templates/build.html
+++ b/bitbake/lib/webhob/bldviewer/templates/build.html
@@ -20,8 +20,7 @@ 
 			<th>Time</th>
 			<th>Errors</th>
 			<th>Warnings</th>
-			<th>CPU usage</th>
-			<th>Disk I/O</th>
+			<th>Output</th>
 			<th>Log</th>
 			<th>Bitbake Version</th>
 			<th>Build Name</th>
@@ -38,8 +37,7 @@ 
 			<td>{% time_difference build.started_on build.completed_on %}</td>
 			<td>{{build.errors_no}}</td>
 			<td>{{build.warnings_no}}</td>
-			<td>{{build.cpu_usage}}</td>
-			<td>{{build.disk_io}}</td>
+			<td>{{build.image_fstypes}}</td>
 			<td>{{build.cooker_log_path}}</td>
 			<td>{{build.bitbake_version}}</td>
 			<td>{{build.build_name}}</td>
diff --git a/bitbake/lib/webhob/orm/models.py b/bitbake/lib/webhob/orm/models.py
index 6b8e2fa..f0492db 100644
--- a/bitbake/lib/webhob/orm/models.py
+++ b/bitbake/lib/webhob/orm/models.py
@@ -18,8 +18,7 @@  class Build(models.Model):
     outcome = models.IntegerField(choices=BUILD_OUTCOME)
     errors_no = models.IntegerField()
     warnings_no = models.IntegerField()
-    cpu_usage = models.IntegerField()
-    disk_io = models.DecimalField(max_digits=20, decimal_places=10)
+    image_fstypes = models.CharField(max_length=100)
     cooker_log_path = models.CharField(max_length=500)
     build_name = models.CharField(max_length=100)
     bitbake_version = models.CharField(max_length=50)