diff options
author | Michael Wood <michael.g.wood@intel.com> | 2016-07-21 14:43:30 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-25 09:23:19 +0100 |
commit | f8f4cffe6fd371f3a7e63690c68f3fcb5dc1f297 (patch) | |
tree | c01addb896670fcccccda92a24fb5e4870a459ea /lib/toaster/orm | |
parent | 6393dbf97d450d2521c0bc9429da0987bb7720ec (diff) | |
download | bitbake-f8f4cffe6fd371f3a7e63690c68f3fcb5dc1f297.tar.gz |
toaster: orm Remove the layerindex specific up_branch fields
We don't need to keep track of layerindex data in our database. And
using branch==release is very confusing in the schema. Instead use the
existing Release definition to keep track of which release a
layer_version is for.
Remove the Branch model and all references to it.
Create a migration path to convert from up_branches to their
corresponding releases.
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/toaster/orm')
-rw-r--r-- | lib/toaster/orm/management/commands/lsupdates.py | 23 | ||||
-rw-r--r-- | lib/toaster/orm/models.py | 32 |
2 files changed, 25 insertions, 30 deletions
diff --git a/lib/toaster/orm/management/commands/lsupdates.py b/lib/toaster/orm/management/commands/lsupdates.py index 138b686eb..be63a8585 100644 --- a/lib/toaster/orm/management/commands/lsupdates.py +++ b/lib/toaster/orm/management/commands/lsupdates.py @@ -102,14 +102,24 @@ class Command(NoArgsCommand): logger.info("Fetching metadata releases for %s", " ".join(whitelist_branch_names)) - # keep a track of the id mappings so that layer_versions can be created - # for these layers later on + branches_info = _get_json_response(apilinks['branches'] + + "?filter=name:%s" + % "OR".join(whitelist_branch_names)) + + # Map the layer index branches to toaster releases + li_branch_id_to_toaster_release = {} + + total = len(branches_info) + for i, branch in enumerate(branches_info): + li_branch_id_to_toaster_release[branch['id']] = \ + Release.objects.get(name=branch['name']) + self.mini_progress("Releases", i, total) + + # keep a track of the layerindex (li) id mappings so that + # layer_versions can be created for these layers later on li_layer_id_to_toaster_layer_id = {} - # We may need this? TODO - #branches_info = _get_json_response(apilinks['branches'] + - # "?filter=name:%s" - # % "OR".join(whitelist_branch_names)) + logger.info("Fetching layers") layers_info = _get_json_response(apilinks['layerItems']) @@ -179,6 +189,7 @@ class Command(NoArgsCommand): lbi['layer']) continue + lv.release = li_branch_id_to_toaster_release[lbi['branch']] lv.up_date = lbi['updated'] lv.commit = lbi['actual_branch'] lv.dirpath = lbi['vcs_subdir'] diff --git a/lib/toaster/orm/models.py b/lib/toaster/orm/models.py index 34ea28c27..72b9dfeaa 100644 --- a/lib/toaster/orm/models.py +++ b/lib/toaster/orm/models.py @@ -144,7 +144,7 @@ class ProjectManager(models.Manager): for rdl in release.releasedefaultlayer_set.all(): lv = Layer_Version.objects.filter( layer__name=rdl.layer_name, - up_branch__name=release.branch_name).first() + release=release).first() if lv: ProjectLayer.objects.create(project=prj, @@ -280,7 +280,7 @@ class Project(models.Model): # guard on release, as it can be null if self.release: queryset = Layer_Version.objects.filter( - (Q(up_branch__name=self.release.branch_name) & + (Q(release=self.release) & Q(build=None) & Q(project=None)) | Q(project=self)) @@ -1257,22 +1257,6 @@ class ReleaseDefaultLayer(models.Model): layer_name = models.CharField(max_length=100, default="") -# Branch class is synced with layerindex.Branch, branches can only come -# from remote layer indexes -class Branch(models.Model): - # id of branch in the layerindex - up_date = models.DateTimeField(null=True, default=None) - - name = models.CharField(max_length=50) - short_description = models.CharField(max_length=50, blank=True) - - class Meta: - verbose_name_plural = "Branches" - - def __unicode__(self): - return self.name - - class LayerSource(object): """ Where the layer metadata came from """ TYPE_LOCAL = 0 @@ -1321,7 +1305,7 @@ class Layer_Version(models.Model): """ search_allowed_fields = ["layer__name", "layer__summary", "layer__description", "layer__vcs_url", - "dirpath", "up_branch__name", "commit", "branch"] + "dirpath", "release__name", "commit", "branch"] build = models.ForeignKey(Build, related_name='layer_version_build', default=None, null=True) @@ -1333,8 +1317,8 @@ class Layer_Version(models.Model): up_date = models.DateTimeField(null=True, default=timezone.now) - # layerindex specific field - up_branch = models.ForeignKey(Branch, null=True, default=None) + # To which metadata release does this layer version belong to + release = models.ForeignKey(Release, null=True, default=None) branch = models.CharField(max_length=80) commit = models.CharField(max_length=100) @@ -1368,7 +1352,7 @@ class Layer_Version(models.Model): extra_path = self.dirpath else: extra_path = path - branchname = self.up_branch.name + branchname = self.release.name url = base_url.replace('%branch%', branchname) # If there's a % in the path (e.g. a wildcard bbappend) we need to encode it @@ -1404,8 +1388,8 @@ class Layer_Version(models.Model): def get_vcs_reference(self): if self.branch is not None and len(self.branch) > 0: return self.branch - if self.up_branch is not None: - return self.up_branch.name + if self.release is not None: + return self.release.name if self.commit is not None and len(self.commit) > 0: return self.commit return 'N/A' |