[review-request][PATCH 0/3] Hide irrelevant builds

[review-request][PATCH 0/3] Hide irrelevant builds

[Elliot Smith]

Hide "in progress" builds everywhere, and only show builds for
the currently-open project on the /project/X/builds page.

Changes since 71b0568fa43285f0946fae93fb43cea5f3bbecec are in
git://git.yoctoproject.org/poky-contrib, elliot/toaster/hide_builds-8236
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=elliot/toaster/hide_builds-8236

Related bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=8236

Alexandru DAMIAN (1):
  toaster: hide irrelevant builds in the project builds view

Elliot Smith (2):
  toaster: Remove cast to date which causes errors during test
  toaster: Add tests for /project/X/builds page

 bitbake/lib/toaster/toastergui/tests.py | 91 ++++++++++++++++++++++++++++++++-
 bitbake/lib/toaster/toastergui/views.py | 59 +++++++++++++++------
 bitbake/toaster-requirements.txt        |  1 +
 3 files changed, 134 insertions(+), 17 deletions(-)

--
Elliot Smith
Software Engineer
Intel OTC

---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ
VAT No: 860 2173 47

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.

[review-request][PATCH 1/3] toaster: hide irrelevant builds in the project builds view

[Elliot Smith]

From: Alexandru DAMIAN <alexandru.damian@intel.com>

This patch fixes the project builds view so it doesn't show
"in progress" builds or builds for other projects.

Note that this also modifies the "all builds" view to use
the same queryset filtering as the project builds. This is
to avoid excluding "in progress" builds more than once, which
is what was happening before.

The patch also has a minor change to ensure that when
displaying the project builds page, only builds for that
project are in the results.

The queryset filtering is now split over several lines so
you can see what's going on.

[YOCTO #8236]

Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
---
 bitbake/lib/toaster/toastergui/views.py | 54 +++++++++++++++++++++++++--------
 1 file changed, 42 insertions(+), 12 deletions(-)

diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py
index c583d96..91bc2fa 100755
--- a/bitbake/lib/toaster/toastergui/views.py
+++ b/bitbake/lib/toaster/toastergui/views.py
@@ -1892,7 +1892,7 @@ if True:
         # be able to display something.  'count' and 'page' are mandatory for all views
         # that use paginators.
 
-        queryset = Build.objects.exclude(outcome = Build.IN_PROGRESS)
+        queryset = Build.objects.all()
 
         try:
             context, pagesize, orderby = _build_list_helper(request, queryset)
@@ -1909,7 +1909,6 @@ if True:
 
     # helper function, to be used on "all builds" and "project builds" pages
     def _build_list_helper(request, queryset_all):
-
         default_orderby = 'completed_on:-'
         (pagesize, orderby) = _get_parameters_values(request, 10, default_orderby)
         mandatory_parameters = { 'count': pagesize,  'page' : 1, 'orderby' : orderby }
@@ -1920,11 +1919,42 @@ if True:
         # boilerplate code that takes a request for an object type and returns a queryset
         # for that object type. copypasta for all needed table searches
         (filter_string, search_term, ordering_string) = _search_tuple(request, Build)
+
         # post-process any date range filters
-        filter_string,daterange_selected = _modify_date_range_filter(filter_string)
-        queryset_all = queryset_all.select_related("project").annotate(errors_no = Count('logmessage', only=Q(logmessage__level=LogMessage.ERROR)|Q(logmessage__level=LogMessage.EXCEPTION))).annotate(warnings_no = Count('logmessage', only=Q(logmessage__level=LogMessage.WARNING))).extra(select={'timespent':'completed_on - started_on'})
-        queryset_with_search = _get_queryset(Build, queryset_all, None, search_term, ordering_string, '-completed_on')
-        queryset = _get_queryset(Build, queryset_all, filter_string, search_term, ordering_string, '-completed_on')
+        filter_string, daterange_selected = _modify_date_range_filter(filter_string)
+
+        # don't show "in progress" builds in "all builds" or "project builds"
+        queryset_all = queryset_all.exclude(outcome = Build.IN_PROGRESS)
+
+        # append project info
+        queryset_all = queryset_all.select_related("project")
+
+        # annotate with number of ERROR and EXCEPTION log messages
+        queryset_all = queryset_all.annotate(
+            errors_no = Count(
+                'logmessage',
+                only=Q(logmessage__level=LogMessage.ERROR) |
+                     Q(logmessage__level=LogMessage.EXCEPTION)
+            )
+        )
+
+        # annotate with number of warnings
+        q_warnings = Q(logmessage__level=LogMessage.WARNING)
+        queryset_all = queryset_all.annotate(
+            warnings_no = Count('logmessage', only=q_warnings)
+        )
+
+        # add timespent field
+        timespent = 'completed_on - started_on'
+        queryset_all = queryset_all.extra(select={'timespent': timespent})
+
+        queryset_with_search = _get_queryset(Build, queryset_all,
+                                             None, search_term,
+                                             ordering_string, '-completed_on')
+
+        queryset = _get_queryset(Build, queryset_all,
+                                 filter_string, search_term,
+                                 ordering_string, '-completed_on')
 
         # retrieve the objects that will be displayed in the table; builds a paginator and gets a page range to display
         build_info = _build_page_range(Paginator(queryset, pagesize), request.GET.get('page', 1))
@@ -2647,7 +2677,7 @@ if True:
             if 'buildDelete' in request.POST:
                 for i in request.POST['buildDelete'].strip().split(" "):
                     try:
-                        br = BuildRequest.objects.select_for_update().get(project = prj, pk = i, state__lte = BuildRequest.REQ_DELETED).delete()
+                        BuildRequest.objects.select_for_update().get(project = prj, pk = i, state__lte = BuildRequest.REQ_DELETED).delete()
                     except BuildRequest.DoesNotExist:
                         pass
 
@@ -2660,12 +2690,12 @@ if True:
                     else:
                         target = t
                         task = ""
-                    ProjectTarget.objects.create(project = prj, target = target, task = task)
-
-                br = prj.schedule_build()
-
+                    ProjectTarget.objects.create(project = prj,
+                                                 target = target,
+                                                 task = task)
+                prj.schedule_build()
 
-        queryset = Build.objects.filter(outcome__lte = Build.IN_PROGRESS)
+        queryset = Build.objects.filter(project_id = pid)
 
         try:
             context, pagesize, orderby = _build_list_helper(request, queryset)
-- 
Elliot Smith
Software Engineer
Intel OTC

---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ
VAT No: 860 2173 47

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.

[review-request][PATCH 2/3] toaster: Remove cast to date which causes errors during test

[Elliot Smith]

Converting to a naive date while preparing data for the view
causes warnings on the console:

"RuntimeWarning: DateTimeField Build.started_on received a
naive datetime (2015-09-01 00:00:00) while time zone support
is active"

Remove the conversion to a Python date, which is unnecessary
anyway.

Signed-off-by: Elliot Smith <elliot.smith@intel.com>
---
 bitbake/lib/toaster/toastergui/views.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py
index 91bc2fa..395d955 100755
--- a/bitbake/lib/toaster/toastergui/views.py
+++ b/bitbake/lib/toaster/toastergui/views.py
@@ -40,7 +40,7 @@ from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 from django.http import HttpResponseBadRequest, HttpResponseNotFound
 from django.utils import timezone
 from django.utils.html import escape
-from datetime import timedelta, datetime, date
+from datetime import timedelta, datetime
 from django.utils import formats
 from toastergui.templatetags.projecttags import json as jsonfilter
 import json
@@ -431,8 +431,7 @@ def _modify_date_range_filter(filter_string):
 def _add_daterange_context(queryset_all, request, daterange_list):
     # calculate the exact begining of local today and yesterday
     today_begin = timezone.localtime(timezone.now())
-    today_begin = date(today_begin.year,today_begin.month,today_begin.day)
-    yesterday_begin = today_begin-timedelta(days=1)
+    yesterday_begin = today_begin - timedelta(days=1)
     # add daterange persistent
     context_date = {}
     context_date['last_date_from'] = request.GET.get('last_date_from',timezone.localtime(timezone.now()).strftime("%d/%m/%Y"))
-- 
Elliot Smith
Software Engineer
Intel OTC

---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ
VAT No: 860 2173 47

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.

[review-request][PATCH 3/3] toaster: Add tests for /project/X/builds page

[Elliot Smith]

Add tests to check whether "in progress" builds are filtered
out correctly, and that only builds for the current project
are shown.

Adds a dependency on BeautifulSoup 4, which is used to simplify
writing tests which verify the HTML.

[YOCTO #8236]

Signed-off-by: Elliot Smith <elliot.smith@intel.com>
---
 bitbake/lib/toaster/toastergui/tests.py | 91 ++++++++++++++++++++++++++++++++-
 bitbake/toaster-requirements.txt        |  1 +
 2 files changed, 90 insertions(+), 2 deletions(-)

diff --git a/bitbake/lib/toaster/toastergui/tests.py b/bitbake/lib/toaster/toastergui/tests.py
index 85e27fe..6c2235f 100644
--- a/bitbake/lib/toaster/toastergui/tests.py
+++ b/bitbake/lib/toaster/toastergui/tests.py
@@ -23,10 +23,12 @@
 
 from django.test import TestCase
 from django.core.urlresolvers import reverse
-from orm.models import Project, Release, BitbakeVersion
-from orm.models import ReleaseLayerSourcePriority, LayerSource, Layer
+from django.utils import timezone
+from orm.models import Project, Release, BitbakeVersion, ProjectTarget
+from orm.models import ReleaseLayerSourcePriority, LayerSource, Layer, Build
 from orm.models import Layer_Version, Recipe, Machine, ProjectLayer
 import json
+from bs4 import BeautifulSoup
 
 PROJECT_NAME = "test project"
 
@@ -178,3 +180,88 @@ class ViewTests(TestCase):
         response = self.client.post(reverse('xhr_importlayer'), args)
         data = json.loads(response.content)
         self.assertNotEqual(data["error"], "ok")
+
+class ProjectBuildsDisplayTest(TestCase):
+    """ Test data at /project/X/builds is displayed correctly """
+
+    def setUp(self):
+        bbv = BitbakeVersion.objects.create(name="bbv1", giturl="/tmp/",
+                                            branch="master", dirpath="")
+        release = Release.objects.create(name="release1",
+                                         bitbake_version=bbv)
+        self.project1 = Project.objects.create_project(name=PROJECT_NAME,
+                                                       release=release)
+        self.project2 = Project.objects.create_project(name=PROJECT_NAME,
+                                                       release=release)
+
+        # parameters for builds to associate with the projects
+        now = timezone.now()
+
+        self.project1_build_success = {
+            "project": self.project1,
+            "started_on": now,
+            "completed_on": now,
+            "outcome": Build.SUCCEEDED
+        }
+
+        self.project1_build_in_progress = {
+            "project": self.project1,
+            "started_on": now,
+            "completed_on": now,
+            "outcome": Build.IN_PROGRESS
+        }
+
+        self.project2_build_success = {
+            "project": self.project2,
+            "started_on": now,
+            "completed_on": now,
+            "outcome": Build.SUCCEEDED
+        }
+
+        self.project2_build_in_progress = {
+            "project": self.project2,
+            "started_on": now,
+            "completed_on": now,
+            "outcome": Build.IN_PROGRESS
+        }
+
+    def _get_rows_for_project(self, project_id):
+        url = reverse("projectbuilds", args=(project_id,))
+        response = self.client.get(url, follow=True)
+        soup = BeautifulSoup(response.content)
+        return soup.select('tr[class="data"]')
+
+    def test_show_builds_for_project(self):
+        """ Builds for a project should be displayed """
+        build1a = Build.objects.create(**self.project1_build_success)
+        build1b = Build.objects.create(**self.project1_build_success)
+        build_rows = self._get_rows_for_project(self.project1.id)
+        self.assertEqual(len(build_rows), 2)
+
+    def test_show_builds_for_project_only(self):
+        """ Builds for other projects should be excluded """
+        build1a = Build.objects.create(**self.project1_build_success)
+        build1b = Build.objects.create(**self.project1_build_success)
+        build1c = Build.objects.create(**self.project1_build_success)
+
+        # shouldn't see these two
+        build2a = Build.objects.create(**self.project2_build_success)
+        build2b = Build.objects.create(**self.project2_build_in_progress)
+
+        build_rows = self._get_rows_for_project(self.project1.id)
+        self.assertEqual(len(build_rows), 3)
+
+    def test_show_builds_exclude_in_progress(self):
+        """ "in progress" builds should not be shown """
+        build1a = Build.objects.create(**self.project1_build_success)
+        build1b = Build.objects.create(**self.project1_build_success)
+
+        # shouldn't see this one
+        build1c = Build.objects.create(**self.project1_build_in_progress)
+
+        # shouldn't see these two either, as they belong to a different project
+        build2a = Build.objects.create(**self.project2_build_success)
+        build2b = Build.objects.create(**self.project2_build_in_progress)
+
+        build_rows = self._get_rows_for_project(self.project1.id)
+        self.assertEqual(len(build_rows), 2)
diff --git a/bitbake/toaster-requirements.txt b/bitbake/toaster-requirements.txt
index 19b5293..1d7d21b 100644
--- a/bitbake/toaster-requirements.txt
+++ b/bitbake/toaster-requirements.txt
@@ -2,3 +2,4 @@ Django==1.6
 South==0.8.4
 argparse==1.2.1
 wsgiref==0.1.2
+beautifulsoup4>=4.4.0
-- 
Elliot Smith
Software Engineer
Intel OTC

---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ
VAT No: 860 2173 47

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.

Re: [review-request][PATCH 0/3] Hide irrelevant builds

[Barros Pena, Belen]

On 02/09/2015 17:04, "toaster-bounces@yoctoproject.org on behalf of Elliot
Smith" <toaster-bounces@yoctoproject.org on behalf of
elliot.smith@intel.com> wrote:

>Hide "in progress" builds everywhere, and only show builds for
>the currently-open project on the /project/X/builds page.
>
>Changes since 71b0568fa43285f0946fae93fb43cea5f3bbecec are in
>git://git.yoctoproject.org/poky-contrib, elliot/toaster/hide_builds-8236
>http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=elliot/toaster/hi
>de_builds-8236

The UI seems to be working correctly:

* Builds in progress no longer show
* Only the builds for the selected project are shown

The latter means that this bug also fixes

https://bugzilla.yoctoproject.org/show_bug.cgi?id=8187

Which was assigned to David Reyna, who had a patch out for review, I
believe. 

Just bringing it up so you can decide which one should go in.

Cheers

Belén

>
>Related bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=8236
>
>Alexandru DAMIAN (1):
>  toaster: hide irrelevant builds in the project builds view
>
>Elliot Smith (2):
>  toaster: Remove cast to date which causes errors during test
>  toaster: Add tests for /project/X/builds page
>
> bitbake/lib/toaster/toastergui/tests.py | 91
>++++++++++++++++++++++++++++++++-
> bitbake/lib/toaster/toastergui/views.py | 59 +++++++++++++++------
> bitbake/toaster-requirements.txt        |  1 +
> 3 files changed, 134 insertions(+), 17 deletions(-)
>
>--
>Elliot Smith
>Software Engineer
>Intel OTC
>
>---------------------------------------------------------------------
>Intel Corporation (UK) Limited
>Registered No. 1134945 (England)
>Registered Office: Pipers Way, Swindon SN3 1RJ
>VAT No: 860 2173 47
>
>This e-mail and any attachments may contain confidential material for
>the sole use of the intended recipient(s). Any review or distribution
>by others is strictly prohibited. If you are not the intended
>recipient, please contact the sender and delete all copies.
>
>-- 
>_______________________________________________
>toaster mailing list
>toaster@yoctoproject.org
>https://lists.yoctoproject.org/listinfo/toaster

Re: [review-request][PATCH 0/3] Hide irrelevant builds

[Brian Avery]

Question:
How does this interact with the default_proj you did?  I couldn't
apply this patchset on top of that one and I upstreamed the
default_proj first.

When I did a quick apply by hand, I got errors when I tried to go look
at the "command line proj" page, but that may have been my mistake.

We should probably make sure that this interacts ok with the
default_proj changes.
-b

On Wed, Sep 2, 2015 at 9:22 AM, Barros Pena, Belen
<belen.barros.pena@intel.com> wrote:
>
>
> On 02/09/2015 17:04, "toaster-bounces@yoctoproject.org on behalf of Elliot
> Smith" <toaster-bounces@yoctoproject.org on behalf of
> elliot.smith@intel.com> wrote:
>
>>Hide "in progress" builds everywhere, and only show builds for
>>the currently-open project on the /project/X/builds page.
>>
>>Changes since 71b0568fa43285f0946fae93fb43cea5f3bbecec are in
>>git://git.yoctoproject.org/poky-contrib, elliot/toaster/hide_builds-8236
>>http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=elliot/toaster/hi
>>de_builds-8236
>
> The UI seems to be working correctly:
>
> * Builds in progress no longer show
> * Only the builds for the selected project are shown
>
> The latter means that this bug also fixes
>
> https://bugzilla.yoctoproject.org/show_bug.cgi?id=8187
>
> Which was assigned to David Reyna, who had a patch out for review, I
> believe.
>
> Just bringing it up so you can decide which one should go in.
>
> Cheers
>
> Belén
>
>>
>>Related bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=8236
>>
>>Alexandru DAMIAN (1):
>>  toaster: hide irrelevant builds in the project builds view
>>
>>Elliot Smith (2):
>>  toaster: Remove cast to date which causes errors during test
>>  toaster: Add tests for /project/X/builds page
>>
>> bitbake/lib/toaster/toastergui/tests.py | 91
>>++++++++++++++++++++++++++++++++-
>> bitbake/lib/toaster/toastergui/views.py | 59 +++++++++++++++------
>> bitbake/toaster-requirements.txt        |  1 +
>> 3 files changed, 134 insertions(+), 17 deletions(-)
>>
>>--
>>Elliot Smith
>>Software Engineer
>>Intel OTC
>>
>>---------------------------------------------------------------------
>>Intel Corporation (UK) Limited
>>Registered No. 1134945 (England)
>>Registered Office: Pipers Way, Swindon SN3 1RJ
>>VAT No: 860 2173 47
>>
>>This e-mail and any attachments may contain confidential material for
>>the sole use of the intended recipient(s). Any review or distribution
>>by others is strictly prohibited. If you are not the intended
>>recipient, please contact the sender and delete all copies.
>>
>>--
>>_______________________________________________
>>toaster mailing list
>>toaster@yoctoproject.org
>>https://lists.yoctoproject.org/listinfo/toaster
>
> --
> _______________________________________________
> toaster mailing list
> toaster@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/toaster

Re: [review-request][PATCH 0/3] Hide irrelevant builds

[Brian Avery]

A bug (small):
In progress build does not appear on the project build page until it
has completed. The # next to the builds(##) at the top of the page
shows 1 even during the build.
https://www.dropbox.com/s/z5iv03fmn0mhehx/Screenshot%202015-09-02%2017.39.41.png?dl=0

-b

On Wed, Sep 2, 2015 at 7:11 PM, Brian Avery <avery.brian@gmail.com> wrote:
> Question:
> How does this interact with the default_proj you did?  I couldn't
> apply this patchset on top of that one and I upstreamed the
> default_proj first.
>
> When I did a quick apply by hand, I got errors when I tried to go look
> at the "command line proj" page, but that may have been my mistake.
>
> We should probably make sure that this interacts ok with the
> default_proj changes.
> -b
>
> On Wed, Sep 2, 2015 at 9:22 AM, Barros Pena, Belen
> <belen.barros.pena@intel.com> wrote:
>>
>>
>> On 02/09/2015 17:04, "toaster-bounces@yoctoproject.org on behalf of Elliot
>> Smith" <toaster-bounces@yoctoproject.org on behalf of
>> elliot.smith@intel.com> wrote:
>>
>>>Hide "in progress" builds everywhere, and only show builds for
>>>the currently-open project on the /project/X/builds page.
>>>
>>>Changes since 71b0568fa43285f0946fae93fb43cea5f3bbecec are in
>>>git://git.yoctoproject.org/poky-contrib, elliot/toaster/hide_builds-8236
>>>http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=elliot/toaster/hi
>>>de_builds-8236
>>
>> The UI seems to be working correctly:
>>
>> * Builds in progress no longer show
>> * Only the builds for the selected project are shown
>>
>> The latter means that this bug also fixes
>>
>> https://bugzilla.yoctoproject.org/show_bug.cgi?id=8187
>>
>> Which was assigned to David Reyna, who had a patch out for review, I
>> believe.
>>
>> Just bringing it up so you can decide which one should go in.
>>
>> Cheers
>>
>> Belén
>>
>>>
>>>Related bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=8236
>>>
>>>Alexandru DAMIAN (1):
>>>  toaster: hide irrelevant builds in the project builds view
>>>
>>>Elliot Smith (2):
>>>  toaster: Remove cast to date which causes errors during test
>>>  toaster: Add tests for /project/X/builds page
>>>
>>> bitbake/lib/toaster/toastergui/tests.py | 91
>>>++++++++++++++++++++++++++++++++-
>>> bitbake/lib/toaster/toastergui/views.py | 59 +++++++++++++++------
>>> bitbake/toaster-requirements.txt        |  1 +
>>> 3 files changed, 134 insertions(+), 17 deletions(-)
>>>
>>>--
>>>Elliot Smith
>>>Software Engineer
>>>Intel OTC
>>>
>>>---------------------------------------------------------------------
>>>Intel Corporation (UK) Limited
>>>Registered No. 1134945 (England)
>>>Registered Office: Pipers Way, Swindon SN3 1RJ
>>>VAT No: 860 2173 47
>>>
>>>This e-mail and any attachments may contain confidential material for
>>>the sole use of the intended recipient(s). Any review or distribution
>>>by others is strictly prohibited. If you are not the intended
>>>recipient, please contact the sender and delete all copies.
>>>
>>>--
>>>_______________________________________________
>>>toaster mailing list
>>>toaster@yoctoproject.org
>>>https://lists.yoctoproject.org/listinfo/toaster
>>
>> --
>> _______________________________________________
>> toaster mailing list
>> toaster@yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/toaster

Re: [review-request][PATCH 0/3] Hide irrelevant builds

[Reyna, David]

Hi Belén and Elliot,

It appears that a fix for 8187 in included in "[Toaster] [review-request][PATCH 1/3] toaster: hide irrelevant".

-        queryset = Build.objects.filter(outcome__lte = Build.IN_PROGRESS)
+        queryset = Build.objects.filter(project_id = pid)

We might as well make my 8187 a duplicate of Elliot's 8236, and be done with it.

- David

> -----Original Message-----
> From: Barros Pena, Belen [mailto:belen.barros.pena@intel.com]
> Sent: Wednesday, September 02, 2015 9:22 AM
> To: SMITH, ELLIOT; toaster@yoctoproject.org
> Cc: Reyna, David
> Subject: Re: [Toaster] [review-request][PATCH 0/3] Hide irrelevant builds
> 
> 
> 
> On 02/09/2015 17:04, "toaster-bounces@yoctoproject.org on behalf of Elliot
> Smith" <toaster-bounces@yoctoproject.org on behalf of
> elliot.smith@intel.com> wrote:
> 
> >Hide "in progress" builds everywhere, and only show builds for
> >the currently-open project on the /project/X/builds page.
> >
> >Changes since 71b0568fa43285f0946fae93fb43cea5f3bbecec are in
> >git://git.yoctoproject.org/poky-contrib, elliot/toaster/hide_builds-8236
> >http://git.yoctoproject.org/cgit.cgi/poky-
> contrib/log/?h=elliot/toaster/hi
> >de_builds-8236
> 
> The UI seems to be working correctly:
> 
> * Builds in progress no longer show
> * Only the builds for the selected project are shown
> 
> The latter means that this bug also fixes
> 
> https://bugzilla.yoctoproject.org/show_bug.cgi?id=8187
> 
> Which was assigned to David Reyna, who had a patch out for review, I
> believe.
> 
> Just bringing it up so you can decide which one should go in.
> 
> Cheers
> 
> Belén
> 
> >
> >Related bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=8236
> >
> >Alexandru DAMIAN (1):
> >  toaster: hide irrelevant builds in the project builds view
> >
> >Elliot Smith (2):
> >  toaster: Remove cast to date which causes errors during test
> >  toaster: Add tests for /project/X/builds page
> >
> > bitbake/lib/toaster/toastergui/tests.py | 91
> >++++++++++++++++++++++++++++++++-
> > bitbake/lib/toaster/toastergui/views.py | 59 +++++++++++++++------
> > bitbake/toaster-requirements.txt        |  1 +
> > 3 files changed, 134 insertions(+), 17 deletions(-)
> >
> >--
> >Elliot Smith
> >Software Engineer
> >Intel OTC
> >
> >---------------------------------------------------------------------
> >Intel Corporation (UK) Limited
> >Registered No. 1134945 (England)
> >Registered Office: Pipers Way, Swindon SN3 1RJ
> >VAT No: 860 2173 47
> >
> >This e-mail and any attachments may contain confidential material for
> >the sole use of the intended recipient(s). Any review or distribution
> >by others is strictly prohibited. If you are not the intended
> >recipient, please contact the sender and delete all copies.
> >
> >--
> >_______________________________________________
> >toaster mailing list
> >toaster@yoctoproject.org
> >https://lists.yoctoproject.org/listinfo/toaster
> 

Re: [review-request][PATCH 0/3] Hide irrelevant builds

[Smith, Elliot]

[-- Attachment #1: Type: text/plain, Size: 4464 bytes --]

On 3 September 2015 at 03:11, Brian Avery <avery.brian@gmail.com> wrote:

> Question:
> How does this interact with the default_proj you did?  I couldn't
> apply this patchset on top of that one and I upstreamed the
> default_proj first.
>

I have been struggling a bit with figuring out how to manage patches going
upstream and clashing with each other.

At the moment, I'm not using any kind of staging area for all the patches I
know have gone upstream. Perhaps there is some branch where others are
doing this, but I haven't been using it so far. Do we have such a thing?

If not, can we agree on a branch which we use to stage all of the patches
we submit to bitbake-devel, which we keep rebased on upstream master? I
think this would help me in situations like this.

Once we have it agreed, I am happy to attempt to bring it into line with
what we think bitbake master should theoretically look like if all our
submitted patches were included in it.

It would then be the responsibility of a reviewer to add any patches they
review to that branch, after they have been submitted to bitbake-devel. (If
a patch gets rejected or altered after being submitted upstream, we would
have to reconstruct our staging area to match upstream again.)

I will test today to see whether there are any issues with the default
project branch and the branch which hides "in progress" projects.

Thanks.
Elliot


>
> When I did a quick apply by hand, I got errors when I tried to go look
> at the "command line proj" page, but that may have been my mistake.
>
> We should probably make sure that this interacts ok with the
> default_proj changes.
> -b
>
> On Wed, Sep 2, 2015 at 9:22 AM, Barros Pena, Belen
> <belen.barros.pena@intel.com> wrote:
> >
> >
> > On 02/09/2015 17:04, "toaster-bounces@yoctoproject.org on behalf of
> Elliot
> > Smith" <toaster-bounces@yoctoproject.org on behalf of
> > elliot.smith@intel.com> wrote:
> >
> >>Hide "in progress" builds everywhere, and only show builds for
> >>the currently-open project on the /project/X/builds page.
> >>
> >>Changes since 71b0568fa43285f0946fae93fb43cea5f3bbecec are in
> >>git://git.yoctoproject.org/poky-contrib, elliot/toaster/hide_builds-8236
> >>
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=elliot/toaster/hi
> >>de_builds-8236
> >
> > The UI seems to be working correctly:
> >
> > * Builds in progress no longer show
> > * Only the builds for the selected project are shown
> >
> > The latter means that this bug also fixes
> >
> > https://bugzilla.yoctoproject.org/show_bug.cgi?id=8187
> >
> > Which was assigned to David Reyna, who had a patch out for review, I
> > believe.
> >
> > Just bringing it up so you can decide which one should go in.
> >
> > Cheers
> >
> > Belén
> >
> >>
> >>Related bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=8236
> >>
> >>Alexandru DAMIAN (1):
> >>  toaster: hide irrelevant builds in the project builds view
> >>
> >>Elliot Smith (2):
> >>  toaster: Remove cast to date which causes errors during test
> >>  toaster: Add tests for /project/X/builds page
> >>
> >> bitbake/lib/toaster/toastergui/tests.py | 91
> >>++++++++++++++++++++++++++++++++-
> >> bitbake/lib/toaster/toastergui/views.py | 59 +++++++++++++++------
> >> bitbake/toaster-requirements.txt        |  1 +
> >> 3 files changed, 134 insertions(+), 17 deletions(-)
> >>
> >>--
> >>Elliot Smith
> >>Software Engineer
> >>Intel OTC
> >>
> >>---------------------------------------------------------------------
> >>Intel Corporation (UK) Limited
> >>Registered No. 1134945 (England)
> >>Registered Office: Pipers Way, Swindon SN3 1RJ
> >>VAT No: 860 2173 47
> >>
> >>This e-mail and any attachments may contain confidential material for
> >>the sole use of the intended recipient(s). Any review or distribution
> >>by others is strictly prohibited. If you are not the intended
> >>recipient, please contact the sender and delete all copies.
> >>
> >>--
> >>_______________________________________________
> >>toaster mailing list
> >>toaster@yoctoproject.org
> >>https://lists.yoctoproject.org/listinfo/toaster
> >
> > --
> > _______________________________________________
> > toaster mailing list
> > toaster@yoctoproject.org
> > https://lists.yoctoproject.org/listinfo/toaster
>



-- 
Elliot Smith
Software Engineer
Intel Open Source Technology Centre

[-- Attachment #2: Type: text/html, Size: 6730 bytes --]

Re: [review-request][PATCH 0/3] Hide irrelevant builds

[Smith, Elliot]

[-- Attachment #1: Type: text/plain, Size: 3947 bytes --]

On 3 September 2015 at 07:15, Reyna, David L (Wind River) <
david.reyna@windriver.com> wrote:

> It appears that a fix for 8187 in included in "[Toaster]
> [review-request][PATCH 1/3] toaster: hide irrelevant".
>
> -        queryset = Build.objects.filter(outcome__lte = Build.IN_PROGRESS)
> +        queryset = Build.objects.filter(project_id = pid)
>
> We might as well make my 8187 a duplicate of Elliot's 8236, and be done
> with it.
>

I think you're right, David. However, the patch you submitted has some
extra stuff in it which mine doesn't. It could be that I've missed
something. I will compare the two today and see if there's anything we need
from your patch which isn't in mine.

Let me just mention that the patch I'm submitting is an update of a stray
inherited branch I'm trying to clean up. The branch did several things,
some of which weren't attached to bugs and were incidental fixes. It was
accidental that it overlapped with the work you were doing. I'll try to
avoid duplication like this in future.

Elliot



>
> - David
>
> > -----Original Message-----
> > From: Barros Pena, Belen [mailto:belen.barros.pena@intel.com]
> > Sent: Wednesday, September 02, 2015 9:22 AM
> > To: SMITH, ELLIOT; toaster@yoctoproject.org
> > Cc: Reyna, David
> > Subject: Re: [Toaster] [review-request][PATCH 0/3] Hide irrelevant builds
> >
> >
> >
> > On 02/09/2015 17:04, "toaster-bounces@yoctoproject.org on behalf of
> Elliot
> > Smith" <toaster-bounces@yoctoproject.org on behalf of
> > elliot.smith@intel.com> wrote:
> >
> > >Hide "in progress" builds everywhere, and only show builds for
> > >the currently-open project on the /project/X/builds page.
> > >
> > >Changes since 71b0568fa43285f0946fae93fb43cea5f3bbecec are in
> > >git://git.yoctoproject.org/poky-contrib,
> elliot/toaster/hide_builds-8236
> > >http://git.yoctoproject.org/cgit.cgi/poky-
> > contrib/log/?h=elliot/toaster/hi
> > >de_builds-8236
> >
> > The UI seems to be working correctly:
> >
> > * Builds in progress no longer show
> > * Only the builds for the selected project are shown
> >
> > The latter means that this bug also fixes
> >
> > https://bugzilla.yoctoproject.org/show_bug.cgi?id=8187
> >
> > Which was assigned to David Reyna, who had a patch out for review, I
> > believe.
> >
> > Just bringing it up so you can decide which one should go in.
> >
> > Cheers
> >
> > Belén
> >
> > >
> > >Related bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=8236
> > >
> > >Alexandru DAMIAN (1):
> > >  toaster: hide irrelevant builds in the project builds view
> > >
> > >Elliot Smith (2):
> > >  toaster: Remove cast to date which causes errors during test
> > >  toaster: Add tests for /project/X/builds page
> > >
> > > bitbake/lib/toaster/toastergui/tests.py | 91
> > >++++++++++++++++++++++++++++++++-
> > > bitbake/lib/toaster/toastergui/views.py | 59 +++++++++++++++------
> > > bitbake/toaster-requirements.txt        |  1 +
> > > 3 files changed, 134 insertions(+), 17 deletions(-)
> > >
> > >--
> > >Elliot Smith
> > >Software Engineer
> > >Intel OTC
> > >
> > >---------------------------------------------------------------------
> > >Intel Corporation (UK) Limited
> > >Registered No. 1134945 (England)
> > >Registered Office: Pipers Way, Swindon SN3 1RJ
> > >VAT No: 860 2173 47
> > >
> > >This e-mail and any attachments may contain confidential material for
> > >the sole use of the intended recipient(s). Any review or distribution
> > >by others is strictly prohibited. If you are not the intended
> > >recipient, please contact the sender and delete all copies.
> > >
> > >--
> > >_______________________________________________
> > >toaster mailing list
> > >toaster@yoctoproject.org
> > >https://lists.yoctoproject.org/listinfo/toaster
> >
>
>


-- 
Elliot Smith
Software Engineer
Intel Open Source Technology Centre

[-- Attachment #2: Type: text/html, Size: 6033 bytes --]

Re: [review-request][PATCH 0/3] Hide irrelevant builds

[Smith, Elliot]

[-- Attachment #1: Type: text/plain, Size: 1657 bytes --]

On 3 September 2015 at 09:13, Smith, Elliot <elliot.smith@intel.com> wrote:

> On 3 September 2015 at 07:15, Reyna, David L (Wind River) <
> david.reyna@windriver.com> wrote:
>
>> It appears that a fix for 8187 in included in "[Toaster]
>> [review-request][PATCH 1/3] toaster: hide irrelevant".
>>
>> -        queryset = Build.objects.filter(outcome__lte = Build.IN_PROGRESS)
>> +        queryset = Build.objects.filter(project_id = pid)
>>
>> We might as well make my 8187 a duplicate of Elliot's 8236, and be done
>> with it.
>>
>
> I think you're right, David. However, the patch you submitted has some
> extra stuff in it which mine doesn't. It could be that I've missed
> something. I will compare the two today and see if there's anything we need
> from your patch which isn't in mine.
>
> Let me just mention that the patch I'm submitting is an update of a stray
> inherited branch I'm trying to clean up. The branch did several things,
> some of which weren't attached to bugs and were incidental fixes. It was
> accidental that it overlapped with the work you were doing. I'll try to
> avoid duplication like this in future.
>

I've looked at David's patch alongside the work Alex did, and it looks like
the two patches do solve the same issue, just in different ways: Alex
rewrites the URL directly on the RedirectException, while David does it in
the _build_list_helper() method. I prefer David's method.

I will attempt to merge the two into my branch by cherry-picking David's
commit to get the better method implementation.

Elliot
-- 
Elliot Smith
Software Engineer
Intel Open Source Technology Centre

[-- Attachment #2: Type: text/html, Size: 2591 bytes --]

Re: [review-request][PATCH 0/3] Hide irrelevant builds

[Barros Pena, Belen]

[-- Attachment #1: Type: text/plain, Size: 3872 bytes --]



On 03/09/2015 03:14, "Brian Avery" <avery.brian@gmail.com> wrote:

>A bug (small):
>In progress build does not appear on the project build page until it
>has completed. The # next to the builds(##) at the top of the page
>shows 1 even during the build.

https://www.dropbox.com/s/z5iv03fmn0mhehx/Screenshot%202015-09-02%2017.39.4
1.png?dl=0

This is a bug (thanks for spotting it): it should be showing 0. Builds are
not shown in tables or added to counters until they complete. When you
have a project with a build in progress and 0 builds completed, the page
should look as shown in the attached file.


Cheers

Belén



>
>-b
>
>On Wed, Sep 2, 2015 at 7:11 PM, Brian Avery <avery.brian@gmail.com> wrote:
>> Question:
>> How does this interact with the default_proj you did?  I couldn't
>> apply this patchset on top of that one and I upstreamed the
>> default_proj first.
>>
>> When I did a quick apply by hand, I got errors when I tried to go look
>> at the "command line proj" page, but that may have been my mistake.
>>
>> We should probably make sure that this interacts ok with the
>> default_proj changes.
>> -b
>>
>> On Wed, Sep 2, 2015 at 9:22 AM, Barros Pena, Belen
>> <belen.barros.pena@intel.com> wrote:
>>>
>>>
>>> On 02/09/2015 17:04, "toaster-bounces@yoctoproject.org on behalf of
>>>Elliot
>>> Smith" <toaster-bounces@yoctoproject.org on behalf of
>>> elliot.smith@intel.com> wrote:
>>>
>>>>Hide "in progress" builds everywhere, and only show builds for
>>>>the currently-open project on the /project/X/builds page.
>>>>
>>>>Changes since 71b0568fa43285f0946fae93fb43cea5f3bbecec are in
>>>>git://git.yoctoproject.org/poky-contrib,
>>>>elliot/toaster/hide_builds-8236
>>>>http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=elliot/toaster
>>>>/hi
>>>>de_builds-8236
>>>
>>> The UI seems to be working correctly:
>>>
>>> * Builds in progress no longer show
>>> * Only the builds for the selected project are shown
>>>
>>> The latter means that this bug also fixes
>>>
>>> https://bugzilla.yoctoproject.org/show_bug.cgi?id=8187
>>>
>>> Which was assigned to David Reyna, who had a patch out for review, I
>>> believe.
>>>
>>> Just bringing it up so you can decide which one should go in.
>>>
>>> Cheers
>>>
>>> Belén
>>>
>>>>
>>>>Related bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=8236
>>>>
>>>>Alexandru DAMIAN (1):
>>>>  toaster: hide irrelevant builds in the project builds view
>>>>
>>>>Elliot Smith (2):
>>>>  toaster: Remove cast to date which causes errors during test
>>>>  toaster: Add tests for /project/X/builds page
>>>>
>>>> bitbake/lib/toaster/toastergui/tests.py | 91
>>>>++++++++++++++++++++++++++++++++-
>>>> bitbake/lib/toaster/toastergui/views.py | 59 +++++++++++++++------
>>>> bitbake/toaster-requirements.txt        |  1 +
>>>> 3 files changed, 134 insertions(+), 17 deletions(-)
>>>>
>>>>--
>>>>Elliot Smith
>>>>Software Engineer
>>>>Intel OTC
>>>>
>>>>---------------------------------------------------------------------
>>>>Intel Corporation (UK) Limited
>>>>Registered No. 1134945 (England)
>>>>Registered Office: Pipers Way, Swindon SN3 1RJ
>>>>VAT No: 860 2173 47
>>>>
>>>>This e-mail and any attachments may contain confidential material for
>>>>the sole use of the intended recipient(s). Any review or distribution
>>>>by others is strictly prohibited. If you are not the intended
>>>>recipient, please contact the sender and delete all copies.
>>>>
>>>>--
>>>>_______________________________________________
>>>>toaster mailing list
>>>>toaster@yoctoproject.org
>>>>https://lists.yoctoproject.org/listinfo/toaster
>>>
>>> --
>>> _______________________________________________
>>> toaster mailing list
>>> toaster@yoctoproject.org
>>> https://lists.yoctoproject.org/listinfo/toaster


[-- Attachment #2: one-build-inprogress.pdf --]
[-- Type: application/pdf, Size: 103688 bytes --]

Re: [review-request][PATCH 0/3] Hide irrelevant builds

[Smith, Elliot]

[-- Attachment #1: Type: text/plain, Size: 4576 bytes --]

On 3 September 2015 at 11:03, Barros Pena, Belen <
belen.barros.pena@intel.com> wrote:

> On 03/09/2015 03:14, "Brian Avery" <avery.brian@gmail.com> wrote:
>
> >A bug (small):
> >In progress build does not appear on the project build page until it
> >has completed. The # next to the builds(##) at the top of the page
> >shows 1 even during the build.
>
> https://www.dropbox.com/s/z5iv03fmn0mhehx/Screenshot%202015-09-02%2017.39.4
> 1.png?dl=0
>
> This is a bug (thanks for spotting it): it should be showing 0. Builds are
> not shown in tables or added to counters until they complete. When you
> have a project with a build in progress and 0 builds completed, the page
> should look as shown in the attached file.
>

Thanks for pointing that out, I will fix it. Does everything else look
correct?

I don't think that queued builds are displayed as shown in your image on
the master branch. Do we have a bug for that already?

(I suggest we don't include a fix for that in this branch, as it is not
related to the specific bug I'm working on [8236].)

Elliot

>On Wed, Sep 2, 2015 at 7:11 PM, Brian Avery <avery.brian@gmail.com> wrote:
> >> Question:
> >> How does this interact with the default_proj you did?  I couldn't
> >> apply this patchset on top of that one and I upstreamed the
> >> default_proj first.
> >>
> >> When I did a quick apply by hand, I got errors when I tried to go look
> >> at the "command line proj" page, but that may have been my mistake.
> >>
> >> We should probably make sure that this interacts ok with the
> >> default_proj changes.
> >> -b
> >>
> >> On Wed, Sep 2, 2015 at 9:22 AM, Barros Pena, Belen
> >> <belen.barros.pena@intel.com> wrote:
> >>>
> >>>
> >>> On 02/09/2015 17:04, "toaster-bounces@yoctoproject.org on behalf of
> >>>Elliot
> >>> Smith" <toaster-bounces@yoctoproject.org on behalf of
> >>> elliot.smith@intel.com> wrote:
> >>>
> >>>>Hide "in progress" builds everywhere, and only show builds for
> >>>>the currently-open project on the /project/X/builds page.
> >>>>
> >>>>Changes since 71b0568fa43285f0946fae93fb43cea5f3bbecec are in
> >>>>git://git.yoctoproject.org/poky-contrib,
> >>>>elliot/toaster/hide_builds-8236
> >>>>
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=elliot/toaster
> >>>>/hi
> >>>>de_builds-8236
> >>>
> >>> The UI seems to be working correctly:
> >>>
> >>> * Builds in progress no longer show
> >>> * Only the builds for the selected project are shown
> >>>
> >>> The latter means that this bug also fixes
> >>>
> >>> https://bugzilla.yoctoproject.org/show_bug.cgi?id=8187
> >>>
> >>> Which was assigned to David Reyna, who had a patch out for review, I
> >>> believe.
> >>>
> >>> Just bringing it up so you can decide which one should go in.
> >>>
> >>> Cheers
> >>>
> >>> Belén
> >>>
> >>>>
> >>>>Related bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=8236
> >>>>
> >>>>Alexandru DAMIAN (1):
> >>>>  toaster: hide irrelevant builds in the project builds view
> >>>>
> >>>>Elliot Smith (2):
> >>>>  toaster: Remove cast to date which causes errors during test
> >>>>  toaster: Add tests for /project/X/builds page
> >>>>
> >>>> bitbake/lib/toaster/toastergui/tests.py | 91
> >>>>++++++++++++++++++++++++++++++++-
> >>>> bitbake/lib/toaster/toastergui/views.py | 59 +++++++++++++++------
> >>>> bitbake/toaster-requirements.txt        |  1 +
> >>>> 3 files changed, 134 insertions(+), 17 deletions(-)
> >>>>
> >>>>--
> >>>>Elliot Smith
> >>>>Software Engineer
> >>>>Intel OTC
> >>>>
> >>>>---------------------------------------------------------------------
> >>>>Intel Corporation (UK) Limited
> >>>>Registered No. 1134945 (England)
> >>>>Registered Office: Pipers Way, Swindon SN3 1RJ
> >>>>VAT No: 860 2173 47
> >>>>
> >>>>This e-mail and any attachments may contain confidential material for
> >>>>the sole use of the intended recipient(s). Any review or distribution
> >>>>by others is strictly prohibited. If you are not the intended
> >>>>recipient, please contact the sender and delete all copies.
> >>>>
> >>>>--
> >>>>_______________________________________________
> >>>>toaster mailing list
> >>>>toaster@yoctoproject.org
> >>>>https://lists.yoctoproject.org/listinfo/toaster
> >>>
> >>> --
> >>> _______________________________________________
> >>> toaster mailing list
> >>> toaster@yoctoproject.org
> >>> https://lists.yoctoproject.org/listinfo/toaster
>
>


-- 
Elliot Smith
Software Engineer
Intel Open Source Technology Centre

[-- Attachment #2: Type: text/html, Size: 7610 bytes --]

Re: [review-request][PATCH 0/3] Hide irrelevant builds

[Barros Pena, Belen]

On 03/09/2015 11:38, "Smith, Elliot" <elliot.smith@intel.com> wrote:

>On 3 September 2015 at 11:03, Barros Pena, Belen
><belen.barros.pena@intel.com> wrote:
>
>On 03/09/2015 03:14, "Brian Avery" <avery.brian@gmail.com> wrote:
>
>>A bug (small):
>>In progress build does not appear on the project build page until it
>>has completed. The # next to the builds(##) at the top of the page
>>shows 1 even during the build.
>
>https://www.dropbox.com/s/z5iv03fmn0mhehx/Screenshot%202015-09-02%2017.39.
>4
>1.png?dl=0
>
>This is a bug (thanks for spotting it): it should be showing 0. Builds are
>not shown in tables or added to counters until they complete. When you
>have a project with a build in progress and 0 builds completed, the page
>should look as shown in the attached file.
>
>
>
>
>Thanks for pointing that out, I will fix it. Does everything else look
>correct?

I think so. 

>
>
>I don't think that queued builds are displayed as shown in your image on
>the master branch. Do we have a bug for that already?

Yes. It was set to 'low' in yesterday's call:

https://bugzilla.yoctoproject.org/show_bug.cgi?id=8242

I'd love to see it fixed though.

Cheers

Belén

>
>
>(I suggest we don't include a fix for that in this branch, as it is not
>related to the specific bug I'm working on [8236].)
>
>
>Elliot
>
>
>
>>On Wed, Sep 2, 2015 at 7:11 PM, Brian Avery <avery.brian@gmail.com>
>>wrote:
>>> Question:
>>> How does this interact with the default_proj you did?  I couldn't
>>> apply this patchset on top of that one and I upstreamed the
>>> default_proj first.
>>>
>>> When I did a quick apply by hand, I got errors when I tried to go look
>>> at the "command line proj" page, but that may have been my mistake.
>>>
>>> We should probably make sure that this interacts ok with the
>>> default_proj changes.
>>> -b
>>>
>>> On Wed, Sep 2, 2015 at 9:22 AM, Barros Pena, Belen
>>> <belen.barros.pena@intel.com> wrote:
>>>>
>>>>
>>>> On 02/09/2015 17:04, "toaster-bounces@yoctoproject.org on behalf of
>>>>Elliot
>>>> Smith" <toaster-bounces@yoctoproject.org on behalf of
>>>> elliot.smith@intel.com> wrote:
>>>>
>>>>>Hide "in progress" builds everywhere, and only show builds for
>>>>>the currently-open project on the /project/X/builds page.
>>>>>
>>>>>Changes since 71b0568fa43285f0946fae93fb43cea5f3bbecec are in
>>>>>git://git.yoctoproject.org/poky-contrib
>>>>><http://git.yoctoproject.org/poky-contrib>,
>>>>>elliot/toaster/hide_builds-8236
>>>>>http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=elliot/toaste
>>>>>r
>>>>>/hi
>>>>>de_builds-8236
>>>>
>>>> The UI seems to be working correctly:
>>>>
>>>> * Builds in progress no longer show
>>>> * Only the builds for the selected project are shown
>>>>
>>>> The latter means that this bug also fixes
>>>>
>>>> 
>https://bugzilla.yoctoproject.org/show_bug.cgi?id=8187
><https://bugzilla.yoctoproject.org/show_bug.cgi?id=8187>
>>>>
>>>> Which was assigned to David Reyna, who had a patch out for review, I
>>>> believe.
>>>>
>>>> Just bringing it up so you can decide which one should go in.
>>>>
>>>> Cheers
>>>>
>>>> Belén
>>>>
>>>>>
>>>>>Related bug: 
>https://bugzilla.yoctoproject.org/show_bug.cgi?id=8236
><https://bugzilla.yoctoproject.org/show_bug.cgi?id=8236>
>>>>>
>>>>>Alexandru DAMIAN (1):
>>>>>  toaster: hide irrelevant builds in the project builds view
>>>>>
>>>>>Elliot Smith (2):
>>>>>  toaster: Remove cast to date which causes errors during test
>>>>>  toaster: Add tests for /project/X/builds page
>>>>>
>>>>> bitbake/lib/toaster/toastergui/tests.py | 91
>>>>>++++++++++++++++++++++++++++++++-
>>>>> bitbake/lib/toaster/toastergui/views.py | 59 +++++++++++++++------
>>>>> bitbake/toaster-requirements.txt        |  1 +
>>>>> 3 files changed, 134 insertions(+), 17 deletions(-)
>>>>>
>>>>>--
>>>>>Elliot Smith
>>>>>Software Engineer
>>>>>Intel OTC
>>>>>
>>>>>---------------------------------------------------------------------
>>>>>Intel Corporation (UK) Limited
>>>>>Registered No. 1134945 (England)
>>>>>Registered Office: Pipers Way, Swindon SN3 1RJ
>>>>>VAT No: 860 2173 47
>>>>>
>>>>>This e-mail and any attachments may contain confidential material for
>>>>>the sole use of the intended recipient(s). Any review or distribution
>>>>>by others is strictly prohibited. If you are not the intended
>>>>>recipient, please contact the sender and delete all copies.
>>>>>
>>>>>--
>>>>>_______________________________________________
>>>>>toaster mailing list
>>>>>toaster@yoctoproject.org
>>>>>https://lists.yoctoproject.org/listinfo/toaster
>>>>
>>>> --
>>>> _______________________________________________
>>>> toaster mailing list
>>>> toaster@yoctoproject.org
>>>> 
>https://lists.yoctoproject.org/listinfo/toaster
><https://lists.yoctoproject.org/listinfo/toaster>
>
>
>
>
>
>
>
>
>
>
>-- 
>Elliot Smith
>Software Engineer
>Intel Open Source Technology Centre
>
>
>
>

Re: [review-request][PATCH 0/3] Hide irrelevant builds

[Smith, Elliot]

[-- Attachment #1: Type: text/plain, Size: 4744 bytes --]

On 3 September 2015 at 09:13, Smith, Elliot <elliot.smith@intel.com> wrote:

> On 3 September 2015 at 07:15, Reyna, David L (Wind River) <
> david.reyna@windriver.com> wrote:
>
>> It appears that a fix for 8187 in included in "[Toaster]
>> [review-request][PATCH 1/3] toaster: hide irrelevant".
>>
>> -        queryset = Build.objects.filter(outcome__lte = Build.IN_PROGRESS)
>> +        queryset = Build.objects.filter(project_id = pid)
>>
>> We might as well make my 8187 a duplicate of Elliot's 8236, and be done
>> with it.
>>
>
> I think you're right, David. However, the patch you submitted has some
> extra stuff in it which mine doesn't. It could be that I've missed
> something. I will compare the two today and see if there's anything we need
> from your patch which isn't in mine.
>
> Let me just mention that the patch I'm submitting is an update of a stray
> inherited branch I'm trying to clean up. The branch did several things,
> some of which weren't attached to bugs and were incidental fixes. It was
> accidental that it overlapped with the work you were doing. I'll try to
> avoid duplication like this in future.
>

I have incorporated elements of the patch you submitted into my branch, and
marked my branch as contributing to the fix for 8187.

You can see the results in:
https://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=elliot/toaster/hide_builds-8236

I tried to cherry-pick from your branch, but its distance from master made
the merge problematic, so I copied over the relevant chunks manually
instead.

If you are happy for me to do so, I can take 8187 and mark it as submitted
via my branch.

Yours,
Elliot


>> > -----Original Message-----
>> > From: Barros Pena, Belen [mailto:belen.barros.pena@intel.com]
>> > Sent: Wednesday, September 02, 2015 9:22 AM
>> > To: SMITH, ELLIOT; toaster@yoctoproject.org
>> > Cc: Reyna, David
>> > Subject: Re: [Toaster] [review-request][PATCH 0/3] Hide irrelevant
>> builds
>> >
>> >
>> >
>> > On 02/09/2015 17:04, "toaster-bounces@yoctoproject.org on behalf of
>> Elliot
>> > Smith" <toaster-bounces@yoctoproject.org on behalf of
>> > elliot.smith@intel.com> wrote:
>> >
>> > >Hide "in progress" builds everywhere, and only show builds for
>> > >the currently-open project on the /project/X/builds page.
>> > >
>> > >Changes since 71b0568fa43285f0946fae93fb43cea5f3bbecec are in
>> > >git://git.yoctoproject.org/poky-contrib,
>> elliot/toaster/hide_builds-8236
>> > >http://git.yoctoproject.org/cgit.cgi/poky-
>> > contrib/log/?h=elliot/toaster/hi
>> > >de_builds-8236
>> >
>> > The UI seems to be working correctly:
>> >
>> > * Builds in progress no longer show
>> > * Only the builds for the selected project are shown
>> >
>> > The latter means that this bug also fixes
>> >
>> > https://bugzilla.yoctoproject.org/show_bug.cgi?id=8187
>> >
>> > Which was assigned to David Reyna, who had a patch out for review, I
>> > believe.
>> >
>> > Just bringing it up so you can decide which one should go in.
>> >
>> > Cheers
>> >
>> > Belén
>> >
>> > >
>> > >Related bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=8236
>> > >
>> > >Alexandru DAMIAN (1):
>> > >  toaster: hide irrelevant builds in the project builds view
>> > >
>> > >Elliot Smith (2):
>> > >  toaster: Remove cast to date which causes errors during test
>> > >  toaster: Add tests for /project/X/builds page
>> > >
>> > > bitbake/lib/toaster/toastergui/tests.py | 91
>> > >++++++++++++++++++++++++++++++++-
>> > > bitbake/lib/toaster/toastergui/views.py | 59 +++++++++++++++------
>> > > bitbake/toaster-requirements.txt        |  1 +
>> > > 3 files changed, 134 insertions(+), 17 deletions(-)
>> > >
>> > >--
>> > >Elliot Smith
>> > >Software Engineer
>> > >Intel OTC
>> > >
>> > >---------------------------------------------------------------------
>> > >Intel Corporation (UK) Limited
>> > >Registered No. 1134945 (England)
>> > >Registered Office: Pipers Way, Swindon SN3 1RJ
>> > >VAT No: 860 2173 47
>> > >
>> > >This e-mail and any attachments may contain confidential material for
>> > >the sole use of the intended recipient(s). Any review or distribution
>> > >by others is strictly prohibited. If you are not the intended
>> > >recipient, please contact the sender and delete all copies.
>> > >
>> > >--
>> > >_______________________________________________
>> > >toaster mailing list
>> > >toaster@yoctoproject.org
>> > >https://lists.yoctoproject.org/listinfo/toaster
>> >
>>
>>
>
>
> --
> Elliot Smith
> Software Engineer
> Intel Open Source Technology Centre
>



-- 
Elliot Smith
Software Engineer
Intel Open Source Technology Centre

[-- Attachment #2: Type: text/html, Size: 7823 bytes --]

Re: [review-request][PATCH 0/3] Hide irrelevant builds

[Smith, Elliot]

[-- Attachment #1: Type: text/plain, Size: 207 bytes --]

I will submit a v2 of this patch series once I know that David is happy
with the "fake cherry pick" solution I've used.

Elliot
-- 
Elliot Smith
Software Engineer
Intel Open Source Technology Centre

[-- Attachment #2: Type: text/html, Size: 378 bytes --]

Re: [review-request][PATCH 0/3] Hide irrelevant builds

[Reyna, David]

[-- Attachment #1: Type: text/plain, Size: 5268 bytes --]

Hi Elliot,

I have looked at “hide_builds-8236” and I see the things that I cared about and the things you cared about.

> I will submit a v2 of this patch series once I know that David is happy with the "fake cherry pick" solution I've used.

I think that it is good to go!

- David

From: Smith, Elliot [mailto:elliot.smith@intel.com]
Sent: Thursday, September 03, 2015 4:46 AM
To: Reyna, David
Cc: BARROS PENA, BELEN; toaster@yoctoproject.org
Subject: Re: [Toaster] [review-request][PATCH 0/3] Hide irrelevant builds

On 3 September 2015 at 09:13, Smith, Elliot <elliot.smith@intel.com<mailto:elliot.smith@intel.com>> wrote:
On 3 September 2015 at 07:15, Reyna, David L (Wind River) <david.reyna@windriver.com<mailto:david.reyna@windriver.com>> wrote:
It appears that a fix for 8187 in included in "[Toaster] [review-request][PATCH 1/3] toaster: hide irrelevant".

-        queryset = Build.objects.filter(outcome__lte = Build.IN_PROGRESS)
+        queryset = Build.objects.filter(project_id = pid)

We might as well make my 8187 a duplicate of Elliot's 8236, and be done with it.

I think you're right, David. However, the patch you submitted has some extra stuff in it which mine doesn't. It could be that I've missed something. I will compare the two today and see if there's anything we need from your patch which isn't in mine.

Let me just mention that the patch I'm submitting is an update of a stray inherited branch I'm trying to clean up. The branch did several things, some of which weren't attached to bugs and were incidental fixes. It was accidental that it overlapped with the work you were doing. I'll try to avoid duplication like this in future.

I have incorporated elements of the patch you submitted into my branch, and marked my branch as contributing to the fix for 8187.

You can see the results in:
https://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=elliot/toaster/hide_builds-8236

I tried to cherry-pick from your branch, but its distance from master made the merge problematic, so I copied over the relevant chunks manually instead.

If you are happy for me to do so, I can take 8187 and mark it as submitted via my branch.

Yours,
Elliot


> -----Original Message-----
> From: Barros Pena, Belen [mailto:belen.barros.pena@intel.com<mailto:belen.barros.pena@intel.com>]
> Sent: Wednesday, September 02, 2015 9:22 AM
> To: SMITH, ELLIOT; toaster@yoctoproject.org<mailto:toaster@yoctoproject.org>
> Cc: Reyna, David
> Subject: Re: [Toaster] [review-request][PATCH 0/3] Hide irrelevant builds
>
>
>
> On 02/09/2015 17:04, "toaster-bounces@yoctoproject.org<mailto:toaster-bounces@yoctoproject.org> on behalf of Elliot
> Smith" <toaster-bounces@yoctoproject.org<mailto:toaster-bounces@yoctoproject.org> on behalf of
> elliot.smith@intel.com<mailto:elliot.smith@intel.com>> wrote:
>
> >Hide "in progress" builds everywhere, and only show builds for
> >the currently-open project on the /project/X/builds page.
> >
> >Changes since 71b0568fa43285f0946fae93fb43cea5f3bbecec are in
> >git://git.yoctoproject.org/poky-contrib<http://git.yoctoproject.org/poky-contrib>, elliot/toaster/hide_builds-8236
> >http://git.yoctoproject.org/cgit.cgi/poky-
> contrib/log/?h=elliot/toaster/hi
> >de_builds-8236
>
> The UI seems to be working correctly:
>
> * Builds in progress no longer show
> * Only the builds for the selected project are shown
>
> The latter means that this bug also fixes
>
> https://bugzilla.yoctoproject.org/show_bug.cgi?id=8187
>
> Which was assigned to David Reyna, who had a patch out for review, I
> believe.
>
> Just bringing it up so you can decide which one should go in.
>
> Cheers
>
> Belén
>
> >
> >Related bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=8236
> >
> >Alexandru DAMIAN (1):
> >  toaster: hide irrelevant builds in the project builds view
> >
> >Elliot Smith (2):
> >  toaster: Remove cast to date which causes errors during test
> >  toaster: Add tests for /project/X/builds page
> >
> > bitbake/lib/toaster/toastergui/tests.py | 91
> >++++++++++++++++++++++++++++++++-
> > bitbake/lib/toaster/toastergui/views.py | 59 +++++++++++++++------
> > bitbake/toaster-requirements.txt        |  1 +
> > 3 files changed, 134 insertions(+), 17 deletions(-)
> >
> >--
> >Elliot Smith
> >Software Engineer
> >Intel OTC
> >
> >---------------------------------------------------------------------
> >Intel Corporation (UK) Limited
> >Registered No. 1134945 (England)
> >Registered Office: Pipers Way, Swindon SN3 1RJ
> >VAT No: 860 2173 47
> >
> >This e-mail and any attachments may contain confidential material for
> >the sole use of the intended recipient(s). Any review or distribution
> >by others is strictly prohibited. If you are not the intended
> >recipient, please contact the sender and delete all copies.
> >
> >--
> >_______________________________________________
> >toaster mailing list
> >toaster@yoctoproject.org<mailto:toaster@yoctoproject.org>
> >https://lists.yoctoproject.org/listinfo/toaster
>



--
Elliot Smith
Software Engineer
Intel Open Source Technology Centre



--
Elliot Smith
Software Engineer
Intel Open Source Technology Centre

[-- Attachment #2: Type: text/html, Size: 12660 bytes --]

Re: [review-request][PATCH 0/3] Hide irrelevant builds

[Brian Avery]

We probably need the equivalent of toaster-mut or toaster-next.
I was waiting for Michael W to get back to have that discussion but
I'm in favour.
-b

On Thu, Sep 3, 2015 at 1:09 AM, Smith, Elliot <elliot.smith@intel.com> wrote:
> On 3 September 2015 at 03:11, Brian Avery <avery.brian@gmail.com> wrote:
>>
>> Question:
>> How does this interact with the default_proj you did?  I couldn't
>> apply this patchset on top of that one and I upstreamed the
>> default_proj first.
>
>
> I have been struggling a bit with figuring out how to manage patches going
> upstream and clashing with each other.
>
> At the moment, I'm not using any kind of staging area for all the patches I
> know have gone upstream. Perhaps there is some branch where others are doing
> this, but I haven't been using it so far. Do we have such a thing?
>
> If not, can we agree on a branch which we use to stage all of the patches we
> submit to bitbake-devel, which we keep rebased on upstream master? I think
> this would help me in situations like this.
>
> Once we have it agreed, I am happy to attempt to bring it into line with
> what we think bitbake master should theoretically look like if all our
> submitted patches were included in it.
>
> It would then be the responsibility of a reviewer to add any patches they
> review to that branch, after they have been submitted to bitbake-devel. (If
> a patch gets rejected or altered after being submitted upstream, we would
> have to reconstruct our staging area to match upstream again.)
>
> I will test today to see whether there are any issues with the default
> project branch and the branch which hides "in progress" projects.
>
> Thanks.
> Elliot
>
>>
>>
>> When I did a quick apply by hand, I got errors when I tried to go look
>> at the "command line proj" page, but that may have been my mistake.
>>
>> We should probably make sure that this interacts ok with the
>> default_proj changes.
>> -b
>>
>> On Wed, Sep 2, 2015 at 9:22 AM, Barros Pena, Belen
>> <belen.barros.pena@intel.com> wrote:
>> >
>> >
>> > On 02/09/2015 17:04, "toaster-bounces@yoctoproject.org on behalf of
>> > Elliot
>> > Smith" <toaster-bounces@yoctoproject.org on behalf of
>> > elliot.smith@intel.com> wrote:
>> >
>> >>Hide "in progress" builds everywhere, and only show builds for
>> >>the currently-open project on the /project/X/builds page.
>> >>
>> >>Changes since 71b0568fa43285f0946fae93fb43cea5f3bbecec are in
>> >>git://git.yoctoproject.org/poky-contrib, elliot/toaster/hide_builds-8236
>>
>> >> >>http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=elliot/toaster/hi
>> >>de_builds-8236
>> >
>> > The UI seems to be working correctly:
>> >
>> > * Builds in progress no longer show
>> > * Only the builds for the selected project are shown
>> >
>> > The latter means that this bug also fixes
>> >
>> > https://bugzilla.yoctoproject.org/show_bug.cgi?id=8187
>> >
>> > Which was assigned to David Reyna, who had a patch out for review, I
>> > believe.
>> >
>> > Just bringing it up so you can decide which one should go in.
>> >
>> > Cheers
>> >
>> > Belén
>> >
>> >>
>> >>Related bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=8236
>> >>
>> >>Alexandru DAMIAN (1):
>> >>  toaster: hide irrelevant builds in the project builds view
>> >>
>> >>Elliot Smith (2):
>> >>  toaster: Remove cast to date which causes errors during test
>> >>  toaster: Add tests for /project/X/builds page
>> >>
>> >> bitbake/lib/toaster/toastergui/tests.py | 91
>> >>++++++++++++++++++++++++++++++++-
>> >> bitbake/lib/toaster/toastergui/views.py | 59 +++++++++++++++------
>> >> bitbake/toaster-requirements.txt        |  1 +
>> >> 3 files changed, 134 insertions(+), 17 deletions(-)
>> >>
>> >>--
>> >>Elliot Smith
>> >>Software Engineer
>> >>Intel OTC
>> >>
>> >>---------------------------------------------------------------------
>> >>Intel Corporation (UK) Limited
>> >>Registered No. 1134945 (England)
>> >>Registered Office: Pipers Way, Swindon SN3 1RJ
>> >>VAT No: 860 2173 47
>> >>
>> >>This e-mail and any attachments may contain confidential material for
>> >>the sole use of the intended recipient(s). Any review or distribution
>> >>by others is strictly prohibited. If you are not the intended
>> >>recipient, please contact the sender and delete all copies.
>> >>
>> >>--
>> >>_______________________________________________
>> >>toaster mailing list
>> >>toaster@yoctoproject.org
>> >>https://lists.yoctoproject.org/listinfo/toaster
>> >
>> > --
>> > _______________________________________________
>> > toaster mailing list
>> > toaster@yoctoproject.org
>> > https://lists.yoctoproject.org/listinfo/toaster
>
>
>
>
> --
> Elliot Smith
> Software Engineer
> Intel Open Source Technology Centre