diff options
| author | Alexandru DAMIAN <alexandru.damian@intel.com> | 2015-06-17 17:30:34 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-26 09:27:32 +0100 |
| commit | 70c4eb8d3acaad267ee943ebfba793f9cc1c5ee6 (patch) | |
| tree | 416f9dcf9c16014e1fc2b975a1de01b286847e25 /bitbake/lib/toaster/orm | |
| parent | 287b49a35b3f06b302ee199ed4b2d123f1aae58c (diff) | |
| download | poky-70c4eb8d3acaad267ee943ebfba793f9cc1c5ee6.tar.gz | |
bitbake: toaster: refactor build model
We remove the "timespent", "errors_no" and "warnings_no" fields
in favor of computing the needed values at runtime. This prevents
inconsistencies in the UI.
Also removeing all references to BuildRequests from the interface -
all build details now display in the build dashboard.
Minor fixes related to data logging.
(Bitbake rev: 44f37394ed3e4ca02f940be172fe4395b0ee0f7d)
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/orm')
| -rw-r--r-- | bitbake/lib/toaster/orm/migrations/0023_auto__del_field_build_warnings_no__del_field_build_errors_no__del_fiel.py | 353 | ||||
| -rw-r--r-- | bitbake/lib/toaster/orm/models.py | 19 |
2 files changed, 366 insertions, 6 deletions
diff --git a/bitbake/lib/toaster/orm/migrations/0023_auto__del_field_build_warnings_no__del_field_build_errors_no__del_fiel.py b/bitbake/lib/toaster/orm/migrations/0023_auto__del_field_build_warnings_no__del_field_build_errors_no__del_fiel.py new file mode 100644 index 0000000000..b5b200cdd8 --- /dev/null +++ b/bitbake/lib/toaster/orm/migrations/0023_auto__del_field_build_warnings_no__del_field_build_errors_no__del_fiel.py | |||
| @@ -0,0 +1,353 @@ | |||
| 1 | # -*- coding: utf-8 -*- | ||
| 2 | from south.utils import datetime_utils as datetime | ||
| 3 | from south.db import db | ||
| 4 | from south.v2 import SchemaMigration | ||
| 5 | from django.db import models | ||
| 6 | |||
| 7 | |||
| 8 | class Migration(SchemaMigration): | ||
| 9 | |||
| 10 | def forwards(self, orm): | ||
| 11 | # Deleting field 'Build.warnings_no' | ||
| 12 | db.delete_column(u'orm_build', 'warnings_no') | ||
| 13 | |||
| 14 | # Deleting field 'Build.errors_no' | ||
| 15 | db.delete_column(u'orm_build', 'errors_no') | ||
| 16 | |||
| 17 | # Deleting field 'Build.timespent' | ||
| 18 | db.delete_column(u'orm_build', 'timespent') | ||
| 19 | |||
| 20 | |||
| 21 | def backwards(self, orm): | ||
| 22 | # Adding field 'Build.warnings_no' | ||
| 23 | db.add_column(u'orm_build', 'warnings_no', | ||
| 24 | self.gf('django.db.models.fields.IntegerField')(default=0), | ||
| 25 | keep_default=False) | ||
| 26 | |||
| 27 | # Adding field 'Build.errors_no' | ||
| 28 | db.add_column(u'orm_build', 'errors_no', | ||
| 29 | self.gf('django.db.models.fields.IntegerField')(default=0), | ||
| 30 | keep_default=False) | ||
| 31 | |||
| 32 | # Adding field 'Build.timespent' | ||
| 33 | db.add_column(u'orm_build', 'timespent', | ||
| 34 | self.gf('django.db.models.fields.IntegerField')(default=0), | ||
| 35 | keep_default=False) | ||
| 36 | |||
| 37 | |||
| 38 | models = { | ||
| 39 | u'orm.bitbakeversion': { | ||
| 40 | 'Meta': {'object_name': 'BitbakeVersion'}, | ||
| 41 | 'branch': ('django.db.models.fields.CharField', [], {'max_length': '32'}), | ||
| 42 | 'dirpath': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
| 43 | 'giturl': ('django.db.models.fields.URLField', [], {'max_length': '200'}), | ||
| 44 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 45 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32'}) | ||
| 46 | }, | ||
| 47 | u'orm.branch': { | ||
| 48 | 'Meta': {'unique_together': "(('layer_source', 'name'), ('layer_source', 'up_id'))", 'object_name': 'Branch'}, | ||
| 49 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 50 | 'layer_source': ('django.db.models.fields.related.ForeignKey', [], {'default': 'True', 'to': u"orm['orm.LayerSource']", 'null': 'True'}), | ||
| 51 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}), | ||
| 52 | 'short_description': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}), | ||
| 53 | 'up_date': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True'}), | ||
| 54 | 'up_id': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True'}) | ||
| 55 | }, | ||
| 56 | u'orm.build': { | ||
| 57 | 'Meta': {'object_name': 'Build'}, | ||
| 58 | 'bitbake_version': ('django.db.models.fields.CharField', [], {'max_length': '50'}), | ||
| 59 | 'build_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| 60 | 'completed_on': ('django.db.models.fields.DateTimeField', [], {}), | ||
| 61 | 'cooker_log_path': ('django.db.models.fields.CharField', [], {'max_length': '500'}), | ||
| 62 | 'distro': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| 63 | 'distro_version': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| 64 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 65 | 'machine': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| 66 | 'outcome': ('django.db.models.fields.IntegerField', [], {'default': '2'}), | ||
| 67 | 'project': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Project']"}), | ||
| 68 | 'started_on': ('django.db.models.fields.DateTimeField', [], {}) | ||
| 69 | }, | ||
| 70 | u'orm.buildartifact': { | ||
| 71 | 'Meta': {'object_name': 'BuildArtifact'}, | ||
| 72 | 'build': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Build']"}), | ||
| 73 | 'file_name': ('django.db.models.fields.FilePathField', [], {'max_length': '100'}), | ||
| 74 | 'file_size': ('django.db.models.fields.IntegerField', [], {}), | ||
| 75 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) | ||
| 76 | }, | ||
| 77 | u'orm.helptext': { | ||
| 78 | 'Meta': {'object_name': 'HelpText'}, | ||
| 79 | 'area': ('django.db.models.fields.IntegerField', [], {}), | ||
| 80 | 'build': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'helptext_build'", 'to': u"orm['orm.Build']"}), | ||
| 81 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 82 | 'key': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| 83 | 'text': ('django.db.models.fields.TextField', [], {}) | ||
| 84 | }, | ||
| 85 | u'orm.layer': { | ||
| 86 | 'Meta': {'unique_together': "(('layer_source', 'up_id'), ('layer_source', 'name'))", 'object_name': 'Layer'}, | ||
| 87 | 'description': ('django.db.models.fields.TextField', [], {'default': 'None', 'null': 'True'}), | ||
| 88 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 89 | 'layer_index_url': ('django.db.models.fields.URLField', [], {'max_length': '200'}), | ||
| 90 | 'layer_source': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['orm.LayerSource']", 'null': 'True'}), | ||
| 91 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| 92 | 'summary': ('django.db.models.fields.TextField', [], {'default': 'None', 'null': 'True'}), | ||
| 93 | 'up_date': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True'}), | ||
| 94 | 'up_id': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True'}), | ||
| 95 | 'vcs_url': ('django.db.models.fields.URLField', [], {'default': 'None', 'max_length': '200', 'null': 'True'}), | ||
| 96 | 'vcs_web_file_base_url': ('django.db.models.fields.URLField', [], {'default': 'None', 'max_length': '200', 'null': 'True'}), | ||
| 97 | 'vcs_web_tree_base_url': ('django.db.models.fields.URLField', [], {'default': 'None', 'max_length': '200', 'null': 'True'}), | ||
| 98 | 'vcs_web_url': ('django.db.models.fields.URLField', [], {'default': 'None', 'max_length': '200', 'null': 'True'}) | ||
| 99 | }, | ||
| 100 | u'orm.layer_version': { | ||
| 101 | 'Meta': {'unique_together': "(('layer_source', 'up_id'),)", 'object_name': 'Layer_Version'}, | ||
| 102 | 'branch': ('django.db.models.fields.CharField', [], {'max_length': '80'}), | ||
| 103 | 'build': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'layer_version_build'", 'null': 'True', 'to': u"orm['orm.Build']"}), | ||
| 104 | 'commit': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| 105 | 'dirpath': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True'}), | ||
| 106 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 107 | 'layer': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'layer_version_layer'", 'to': u"orm['orm.Layer']"}), | ||
| 108 | 'layer_source': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['orm.LayerSource']", 'null': 'True'}), | ||
| 109 | 'local_path': ('django.db.models.fields.FilePathField', [], {'default': "'/'", 'max_length': '1024'}), | ||
| 110 | 'priority': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
| 111 | 'project': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['orm.Project']", 'null': 'True'}), | ||
| 112 | 'up_branch': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['orm.Branch']", 'null': 'True'}), | ||
| 113 | 'up_date': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True'}), | ||
| 114 | 'up_id': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True'}) | ||
| 115 | }, | ||
| 116 | u'orm.layersource': { | ||
| 117 | 'Meta': {'unique_together': "(('sourcetype', 'apiurl'),)", 'object_name': 'LayerSource'}, | ||
| 118 | 'apiurl': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True'}), | ||
| 119 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 120 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '63'}), | ||
| 121 | 'sourcetype': ('django.db.models.fields.IntegerField', [], {}) | ||
| 122 | }, | ||
| 123 | u'orm.layerversiondependency': { | ||
| 124 | 'Meta': {'unique_together': "(('layer_source', 'up_id'),)", 'object_name': 'LayerVersionDependency'}, | ||
| 125 | 'depends_on': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'dependees'", 'to': u"orm['orm.Layer_Version']"}), | ||
| 126 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 127 | 'layer_source': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['orm.LayerSource']", 'null': 'True'}), | ||
| 128 | 'layer_version': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'dependencies'", 'to': u"orm['orm.Layer_Version']"}), | ||
| 129 | 'up_id': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True'}) | ||
| 130 | }, | ||
| 131 | u'orm.logmessage': { | ||
| 132 | 'Meta': {'object_name': 'LogMessage'}, | ||
| 133 | 'build': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Build']"}), | ||
| 134 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 135 | 'level': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
| 136 | 'lineno': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), | ||
| 137 | 'message': ('django.db.models.fields.CharField', [], {'max_length': '240'}), | ||
| 138 | 'pathname': ('django.db.models.fields.FilePathField', [], {'max_length': '255', 'blank': 'True'}), | ||
| 139 | 'task': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Task']", 'null': 'True', 'blank': 'True'}) | ||
| 140 | }, | ||
| 141 | u'orm.machine': { | ||
| 142 | 'Meta': {'unique_together': "(('layer_source', 'up_id'),)", 'object_name': 'Machine'}, | ||
| 143 | 'description': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
| 144 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 145 | 'layer_source': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['orm.LayerSource']", 'null': 'True'}), | ||
| 146 | 'layer_version': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Layer_Version']"}), | ||
| 147 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
| 148 | 'up_date': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True'}), | ||
| 149 | 'up_id': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True'}) | ||
| 150 | }, | ||
| 151 | u'orm.package': { | ||
| 152 | 'Meta': {'object_name': 'Package'}, | ||
| 153 | 'build': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Build']"}), | ||
| 154 | 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), | ||
| 155 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 156 | 'installed_name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '100'}), | ||
| 157 | 'installed_size': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
| 158 | 'license': ('django.db.models.fields.CharField', [], {'max_length': '80', 'blank': 'True'}), | ||
| 159 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| 160 | 'recipe': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Recipe']", 'null': 'True'}), | ||
| 161 | 'revision': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}), | ||
| 162 | 'section': ('django.db.models.fields.CharField', [], {'max_length': '80', 'blank': 'True'}), | ||
| 163 | 'size': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
| 164 | 'summary': ('django.db.models.fields.TextField', [], {'blank': 'True'}), | ||
| 165 | 'version': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}) | ||
| 166 | }, | ||
| 167 | u'orm.package_dependency': { | ||
| 168 | 'Meta': {'object_name': 'Package_Dependency'}, | ||
| 169 | 'dep_type': ('django.db.models.fields.IntegerField', [], {}), | ||
| 170 | 'depends_on': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'package_dependencies_target'", 'to': u"orm['orm.Package']"}), | ||
| 171 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 172 | 'package': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'package_dependencies_source'", 'to': u"orm['orm.Package']"}), | ||
| 173 | 'target': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Target']", 'null': 'True'}) | ||
| 174 | }, | ||
| 175 | u'orm.package_file': { | ||
| 176 | 'Meta': {'object_name': 'Package_File'}, | ||
| 177 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 178 | 'package': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'buildfilelist_package'", 'to': u"orm['orm.Package']"}), | ||
| 179 | 'path': ('django.db.models.fields.FilePathField', [], {'max_length': '255', 'blank': 'True'}), | ||
| 180 | 'size': ('django.db.models.fields.IntegerField', [], {}) | ||
| 181 | }, | ||
| 182 | u'orm.project': { | ||
| 183 | 'Meta': {'object_name': 'Project'}, | ||
| 184 | 'bitbake_version': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.BitbakeVersion']", 'null': 'True'}), | ||
| 185 | 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), | ||
| 186 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 187 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| 188 | 'release': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Release']", 'null': 'True'}), | ||
| 189 | 'short_description': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}), | ||
| 190 | 'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), | ||
| 191 | 'user_id': ('django.db.models.fields.IntegerField', [], {'null': 'True'}) | ||
| 192 | }, | ||
| 193 | u'orm.projectlayer': { | ||
| 194 | 'Meta': {'unique_together': "(('project', 'layercommit'),)", 'object_name': 'ProjectLayer'}, | ||
| 195 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 196 | 'layercommit': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Layer_Version']", 'null': 'True'}), | ||
| 197 | 'optional': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
| 198 | 'project': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Project']"}) | ||
| 199 | }, | ||
| 200 | u'orm.projecttarget': { | ||
| 201 | 'Meta': {'object_name': 'ProjectTarget'}, | ||
| 202 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 203 | 'project': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Project']"}), | ||
| 204 | 'target': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| 205 | 'task': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True'}) | ||
| 206 | }, | ||
| 207 | u'orm.projectvariable': { | ||
| 208 | 'Meta': {'object_name': 'ProjectVariable'}, | ||
| 209 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 210 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| 211 | 'project': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Project']"}), | ||
| 212 | 'value': ('django.db.models.fields.TextField', [], {'blank': 'True'}) | ||
| 213 | }, | ||
| 214 | u'orm.recipe': { | ||
| 215 | 'Meta': {'unique_together': "(('layer_version', 'file_path', 'pathflags'),)", 'object_name': 'Recipe'}, | ||
| 216 | 'bugtracker': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), | ||
| 217 | 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), | ||
| 218 | 'file_path': ('django.db.models.fields.FilePathField', [], {'max_length': '255'}), | ||
| 219 | 'homepage': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), | ||
| 220 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 221 | 'layer_source': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['orm.LayerSource']", 'null': 'True'}), | ||
| 222 | 'layer_version': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'recipe_layer_version'", 'to': u"orm['orm.Layer_Version']"}), | ||
| 223 | 'license': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}), | ||
| 224 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), | ||
| 225 | 'pathflags': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}), | ||
| 226 | 'section': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), | ||
| 227 | 'summary': ('django.db.models.fields.TextField', [], {'blank': 'True'}), | ||
| 228 | 'up_date': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True'}), | ||
| 229 | 'up_id': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True'}), | ||
| 230 | 'version': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}) | ||
| 231 | }, | ||
| 232 | u'orm.recipe_dependency': { | ||
| 233 | 'Meta': {'object_name': 'Recipe_Dependency'}, | ||
| 234 | 'dep_type': ('django.db.models.fields.IntegerField', [], {}), | ||
| 235 | 'depends_on': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'r_dependencies_depends'", 'to': u"orm['orm.Recipe']"}), | ||
| 236 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 237 | 'recipe': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'r_dependencies_recipe'", 'to': u"orm['orm.Recipe']"}) | ||
| 238 | }, | ||
| 239 | u'orm.release': { | ||
| 240 | 'Meta': {'object_name': 'Release'}, | ||
| 241 | 'bitbake_version': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.BitbakeVersion']"}), | ||
| 242 | 'branch_name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '50'}), | ||
| 243 | 'description': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
| 244 | 'helptext': ('django.db.models.fields.TextField', [], {'null': 'True'}), | ||
| 245 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 246 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32'}) | ||
| 247 | }, | ||
| 248 | u'orm.releasedefaultlayer': { | ||
| 249 | 'Meta': {'object_name': 'ReleaseDefaultLayer'}, | ||
| 250 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 251 | 'layer_name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '100'}), | ||
| 252 | 'release': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Release']"}) | ||
| 253 | }, | ||
| 254 | u'orm.releaselayersourcepriority': { | ||
| 255 | 'Meta': {'unique_together': "(('release', 'layer_source'),)", 'object_name': 'ReleaseLayerSourcePriority'}, | ||
| 256 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 257 | 'layer_source': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.LayerSource']"}), | ||
| 258 | 'priority': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
| 259 | 'release': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Release']"}) | ||
| 260 | }, | ||
| 261 | u'orm.target': { | ||
| 262 | 'Meta': {'object_name': 'Target'}, | ||
| 263 | 'build': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Build']"}), | ||
| 264 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 265 | 'image_size': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
| 266 | 'is_image': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 267 | 'license_manifest_path': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True'}), | ||
| 268 | 'target': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| 269 | 'task': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True'}) | ||
| 270 | }, | ||
| 271 | u'orm.target_file': { | ||
| 272 | 'Meta': {'object_name': 'Target_File'}, | ||
| 273 | 'directory': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'directory_set'", 'null': 'True', 'to': u"orm['orm.Target_File']"}), | ||
| 274 | 'group': ('django.db.models.fields.CharField', [], {'max_length': '128'}), | ||
| 275 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 276 | 'inodetype': ('django.db.models.fields.IntegerField', [], {}), | ||
| 277 | 'owner': ('django.db.models.fields.CharField', [], {'max_length': '128'}), | ||
| 278 | 'path': ('django.db.models.fields.FilePathField', [], {'max_length': '100'}), | ||
| 279 | 'permission': ('django.db.models.fields.CharField', [], {'max_length': '16'}), | ||
| 280 | 'size': ('django.db.models.fields.IntegerField', [], {}), | ||
| 281 | 'sym_target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'symlink_set'", 'null': 'True', 'to': u"orm['orm.Target_File']"}), | ||
| 282 | 'target': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Target']"}) | ||
| 283 | }, | ||
| 284 | u'orm.target_image_file': { | ||
| 285 | 'Meta': {'object_name': 'Target_Image_File'}, | ||
| 286 | 'file_name': ('django.db.models.fields.FilePathField', [], {'max_length': '254'}), | ||
| 287 | 'file_size': ('django.db.models.fields.IntegerField', [], {}), | ||
| 288 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 289 | 'target': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Target']"}) | ||
| 290 | }, | ||
| 291 | u'orm.target_installed_package': { | ||
| 292 | 'Meta': {'object_name': 'Target_Installed_Package'}, | ||
| 293 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 294 | 'package': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'buildtargetlist_package'", 'to': u"orm['orm.Package']"}), | ||
| 295 | 'target': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['orm.Target']"}) | ||
| 296 | }, | ||
| 297 | u'orm.task': { | ||
| 298 | 'Meta': {'ordering': "('order', 'recipe')", 'unique_together': "(('build', 'recipe', 'task_name'),)", 'object_name': 'Task'}, | ||
| 299 | 'build': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'task_build'", 'to': u"orm['orm.Build']"}), | ||
| 300 | 'cpu_usage': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '8', 'decimal_places': '2'}), | ||
| 301 | 'disk_io': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), | ||
| 302 | 'elapsed_time': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '8', 'decimal_places': '2'}), | ||
| 303 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 304 | 'line_number': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
| 305 | 'logfile': ('django.db.models.fields.FilePathField', [], {'max_length': '255', 'blank': 'True'}), | ||
| 306 | 'message': ('django.db.models.fields.CharField', [], {'max_length': '240'}), | ||
| 307 | 'order': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), | ||
| 308 | 'outcome': ('django.db.models.fields.IntegerField', [], {'default': '-1'}), | ||
| 309 | 'path_to_sstate_obj': ('django.db.models.fields.FilePathField', [], {'max_length': '500', 'blank': 'True'}), | ||
| 310 | 'recipe': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'tasks'", 'to': u"orm['orm.Recipe']"}), | ||
| 311 | 'script_type': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
| 312 | 'source_url': ('django.db.models.fields.FilePathField', [], {'max_length': '255', 'blank': 'True'}), | ||
| 313 | 'sstate_checksum': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), | ||
| 314 | 'sstate_result': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
| 315 | 'task_executed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 316 | 'task_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| 317 | 'work_directory': ('django.db.models.fields.FilePathField', [], {'max_length': '255', 'blank': 'True'}) | ||
| 318 | }, | ||
| 319 | u'orm.task_dependency': { | ||
| 320 | 'Meta': {'object_name': 'Task_Dependency'}, | ||
| 321 | 'depends_on': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'task_dependencies_depends'", 'to': u"orm['orm.Task']"}), | ||
| 322 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 323 | 'task': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'task_dependencies_task'", 'to': u"orm['orm.Task']"}) | ||
| 324 | }, | ||
| 325 | u'orm.toastersetting': { | ||
| 326 | 'Meta': {'object_name': 'ToasterSetting'}, | ||
| 327 | 'helptext': ('django.db.models.fields.TextField', [], {}), | ||
| 328 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 329 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '63'}), | ||
| 330 | 'value': ('django.db.models.fields.CharField', [], {'max_length': '255'}) | ||
| 331 | }, | ||
| 332 | u'orm.variable': { | ||
| 333 | 'Meta': {'object_name': 'Variable'}, | ||
| 334 | 'build': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'variable_build'", 'to': u"orm['orm.Build']"}), | ||
| 335 | 'changed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 336 | 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), | ||
| 337 | 'human_readable_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}), | ||
| 338 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 339 | 'variable_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| 340 | 'variable_value': ('django.db.models.fields.TextField', [], {'blank': 'True'}) | ||
| 341 | }, | ||
| 342 | u'orm.variablehistory': { | ||
| 343 | 'Meta': {'object_name': 'VariableHistory'}, | ||
| 344 | 'file_name': ('django.db.models.fields.FilePathField', [], {'max_length': '255'}), | ||
| 345 | u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 346 | 'line_number': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), | ||
| 347 | 'operation': ('django.db.models.fields.CharField', [], {'max_length': '64'}), | ||
| 348 | 'value': ('django.db.models.fields.TextField', [], {'blank': 'True'}), | ||
| 349 | 'variable': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'vhistory'", 'to': u"orm['orm.Variable']"}) | ||
| 350 | } | ||
| 351 | } | ||
| 352 | |||
| 353 | complete_apps = ['orm'] \ No newline at end of file | ||
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py index e93629b7ba..077c94d818 100644 --- a/bitbake/lib/toaster/orm/models.py +++ b/bitbake/lib/toaster/orm/models.py | |||
| @@ -147,7 +147,7 @@ class Project(models.Model): | |||
| 147 | if (-1 == build_id): | 147 | if (-1 == build_id): |
| 148 | return( 0 ) | 148 | return( 0 ) |
| 149 | try: | 149 | try: |
| 150 | return Build.objects.filter(id = build_id)[ 0 ].errors_no | 150 | return Build.objects.filter(id = build_id)[ 0 ].errors.count() |
| 151 | except (Build.DoesNotExist,IndexError): | 151 | except (Build.DoesNotExist,IndexError): |
| 152 | return( "not_found" ) | 152 | return( "not_found" ) |
| 153 | 153 | ||
| @@ -156,7 +156,7 @@ class Project(models.Model): | |||
| 156 | if (-1 == build_id): | 156 | if (-1 == build_id): |
| 157 | return( 0 ) | 157 | return( 0 ) |
| 158 | try: | 158 | try: |
| 159 | return Build.objects.filter(id = build_id)[ 0 ].warnings_no | 159 | return Build.objects.filter(id = build_id)[ 0 ].warnings.count() |
| 160 | except (Build.DoesNotExist,IndexError): | 160 | except (Build.DoesNotExist,IndexError): |
| 161 | return( "not_found" ) | 161 | return( "not_found" ) |
| 162 | 162 | ||
| @@ -248,10 +248,7 @@ class Build(models.Model): | |||
| 248 | distro_version = models.CharField(max_length=100) | 248 | distro_version = models.CharField(max_length=100) |
| 249 | started_on = models.DateTimeField() | 249 | started_on = models.DateTimeField() |
| 250 | completed_on = models.DateTimeField() | 250 | completed_on = models.DateTimeField() |
| 251 | timespent = models.IntegerField(default=0) | ||
| 252 | outcome = models.IntegerField(choices=BUILD_OUTCOME, default=IN_PROGRESS) | 251 | outcome = models.IntegerField(choices=BUILD_OUTCOME, default=IN_PROGRESS) |
| 253 | errors_no = models.IntegerField(default=0) | ||
| 254 | warnings_no = models.IntegerField(default=0) | ||
| 255 | cooker_log_path = models.CharField(max_length=500) | 252 | cooker_log_path = models.CharField(max_length=500) |
| 256 | build_name = models.CharField(max_length=100) | 253 | build_name = models.CharField(max_length=100) |
| 257 | bitbake_version = models.CharField(max_length=50) | 254 | bitbake_version = models.CharField(max_length=50) |
| @@ -281,6 +278,17 @@ class Build(models.Model): | |||
| 281 | def toaster_exceptions(self): | 278 | def toaster_exceptions(self): |
| 282 | return self.logmessage_set.filter(level=LogMessage.EXCEPTION) | 279 | return self.logmessage_set.filter(level=LogMessage.EXCEPTION) |
| 283 | 280 | ||
| 281 | @property | ||
| 282 | def errors(self): | ||
| 283 | return (self.logmessage_set.filter(level=LogMessage.ERROR)|self.logmessage_set.filter(level=LogMessage.EXCEPTION)) | ||
| 284 | |||
| 285 | @property | ||
| 286 | def warnings(self): | ||
| 287 | return self.logmessage_set.filter(level=LogMessage.WARNING) | ||
| 288 | |||
| 289 | @property | ||
| 290 | def timespent_seconds(self): | ||
| 291 | return (self.completed_on - self.started_on).total_seconds() | ||
| 284 | 292 | ||
| 285 | def get_current_status(self): | 293 | def get_current_status(self): |
| 286 | from bldcontrol.models import BuildRequest | 294 | from bldcontrol.models import BuildRequest |
| @@ -298,7 +306,6 @@ class BuildArtifact(models.Model): | |||
| 298 | file_name = models.FilePathField() | 306 | file_name = models.FilePathField() |
| 299 | file_size = models.IntegerField() | 307 | file_size = models.IntegerField() |
| 300 | 308 | ||
| 301 | |||
| 302 | def get_local_file_name(self): | 309 | def get_local_file_name(self): |
| 303 | try: | 310 | try: |
| 304 | deploydir = Variable.objects.get(build = self.build, variable_name="DEPLOY_DIR").variable_value | 311 | deploydir = Variable.objects.get(build = self.build, variable_name="DEPLOY_DIR").variable_value |
