squad 1.74__py3-none-any.whl → 1.75__py3-none-any.whl

squad/api/rest.py

@@ -1400,7 +1400,6 @@ class FailuresWithConfidenceSerializer(TestSerializer):
             'has_known_issues',
             'result',
             'url',
-            'suite',
         )
 
 

squad/ci/backend/tuxsuite.py

@@ -100,9 +100,14 @@ class Backend(BaseBackend):
 
         ('BUILD', 'linaro@anders', '1yPYGaOEPNwr2pCqBgONY43zORq')
 
+        The leading string determines the type of the tuxsuite object:
+        - BUILD
+        - OEBUILD
+        - TEST
+
         """
 
-        regex = r'^(BUILD|TEST):([0-9a-z_\-]+@[0-9a-z_\-]+)#([a-zA-Z0-9]+)$'
+        regex = r'^(OEBUILD|BUILD|TEST):([0-9a-z_\-]+@[0-9a-z_\-]+)#([a-zA-Z0-9]+)$'
         matches = re.findall(regex, job_id)
         if len(matches) == 0:
             raise FetchIssue(f'Job id "{job_id}" does not match "{regex}"')
@@ -113,18 +118,19 @@ class Backend(BaseBackend):
     def generate_job_id(self, result_type, result):
         """
             The job id for TuxSuite results is generated using 3 pieces of info:
-            1. If it's either "BUILD" or "TEST" result;
+            1. If it's either "BUILD", "OEBUILD" or "TEST" result;
             2. The TuxSuite project. Ex: "linaro/anders"
             3. The ksuid of the object. Ex: "1yPYGaOEPNwr2pfqBgONY43zORp"
 
             A couple examples for job_id are:
             - BUILD:linaro@anders#1yPYGaOEPNwr2pCqBgONY43zORq
+            - OEBUILD:linaro@lkft#2Wetiz7Qs0TbtfPgPT7hUObWqDK
             - TEST:arm@bob#1yPYGaOEPNwr2pCqBgONY43zORp
 
             Then it's up to SQUAD's TuxSuite backend to parse the job_id
             and fetch results properly.
         """
-        _type = "TEST" if result_type == "test" else "BUILD"
+        _type = result_type.upper()
         project = result["project"].replace("/", "@")
         uid = result["uid"]
         return f"{_type}:{project}#{uid}"
@@ -257,6 +263,30 @@ class Backend(BaseBackend):
 
         return status, completed, metadata, tests, metrics, logs
 
+    def parse_oebuild_results(self, test_job, job_url, results, settings):
+        required_keys = ['download_url', 'result']
+        self.__check_required_keys__(required_keys, results)
+
+        # Make metadata
+        metadata_keys = settings.get('OEBUILD_METADATA_KEYS', [])
+        metadata = {k: results.get(k) for k in metadata_keys}
+        metadata['job_url'] = job_url
+        metadata['job_id'] = test_job.job_id
+
+        sources = results.get('sources')
+        if sources:
+            metadata['sources'] = sources
+
+        # Create tests and metrics
+        tests = {}
+        metrics = {}
+        completed = True
+        status = 'Complete'
+        tests['build/build'] = 'pass' if results['result'] == 'pass' else 'fail'
+        logs = self.fetch_url(results['download_url'], 'build.log').text
+
+        return status, completed, metadata, tests, metrics, logs
+
     def parse_test_results(self, test_job, job_url, results, settings):
         status = 'Complete'
         completed = True

squad/ci/models.py

@@ -4,6 +4,7 @@ import traceback
 import yaml
 from io import StringIO
 from django.db import models, transaction, DatabaseError
+from django.db.models import Q
 from django.utils import timezone
 from dateutil.relativedelta import relativedelta
 
@@ -66,6 +67,19 @@ class Backend(models.Model):
                 yield test_job
 
     def fetch(self, job_id):
+        # Job statuses can be one of:
+        #     * None
+        #     * Submitted
+        #     * Scheduling
+        #     * Scheduled
+        #     * Running
+        #     * Complete
+        #     * Incomplete
+        #     * Canceled
+        #     * Fetching
+        # Only jobs in 'Complete', 'Canceled' and 'Incomplete' are eligible for fetching
+
+        job_status = None
         with transaction.atomic():
             try:
                 test_job = TestJob.objects.select_for_update(nowait=True).get(pk=job_id)
@@ -91,6 +105,8 @@ class Backend(models.Model):
                 test_job.save()
                 return
 
+            job_status = test_job.job_status
+            test_job.job_status = 'Fetching'
             test_job.fetched = True
             test_job.fetched_at = timezone.now()
             test_job.save()
@@ -130,10 +146,16 @@ class Backend(models.Model):
         except DuplicatedTestJob as exception:
             logger.error('Failed to fetch test_job(%d): "%s"' % (test_job.id, str(exception)))
 
+        if test_job.testrun:
+            self.__postprocess_testjob__(test_job)
+
+        # Removed the 'Fetching' job_status only after eventual plugins
+        # are finished, this garantees extra tests and metadata to
+        # be in SQUAD before the build is considered finished
+        test_job.job_status = job_status
         test_job.save()
 
         if test_job.testrun:
-            self.__postprocess_testjob__(test_job)
             UpdateProjectStatus()(test_job.testrun)
 
     def __postprocess_testjob__(self, test_job):
@@ -177,9 +199,16 @@ class Backend(models.Model):
         return '%s (%s)' % (self.name, self.implementation_type)
 
 
+class TestJobManager(models.Manager):
+
+    def pending(self):
+        return self.filter(Q(fetched=False) | Q(job_status='Fetching'))
+
+
 class TestJob(models.Model):
 
     __test__ = False
+    objects = TestJobManager()
 
     # input - internal
     backend = models.ForeignKey(Backend, related_name='test_jobs', on_delete=models.CASCADE)

squad/core/models.py

@@ -584,10 +584,11 @@ class Build(models.Model):
     def important_metadata(self):
         wanted = (self.project.important_metadata_keys or '').splitlines()
         m = self.metadata
+        metadata = self.metadata
         if len(wanted):
-            return {k: m[k] for k in wanted if k in m}
-        else:
-            return self.metadata
+            metadata = {k: m[k] for k in wanted if k in m}
+
+        return metadata
 
     @property
     def has_extra_metadata(self):
@@ -619,7 +620,7 @@ class Build(models.Model):
         # dependency on squad.ci, what in theory violates our architecture.
         testjobs = self.test_jobs
         if testjobs.count() > 0:
-            if testjobs.filter(fetched=False).count() > 0:
+            if testjobs.pending().count() > 0:
                 # a build that has pending CI jobs is NOT finished
                 reasons.append("There are unfinished CI jobs")
             else:

squad/frontend/views.py

@@ -6,6 +6,9 @@ from django.core.paginator import Paginator, EmptyPage
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponse, Http404
 from django.shortcuts import render, get_object_or_404, redirect, reverse
+from django.utils import timezone
+
+from dateutil.relativedelta import relativedelta
 
 from squad.ci.models import TestJob
 from squad.core.models import Group, Metric, ProjectStatus, Status, MetricThreshold, KnownIssue, Test
@@ -83,24 +86,30 @@ def home(request):
     return render(request, 'squad/index.jinja2', context)
 
 
-def group_home(request, group_slug):
-    group = get_object_or_404(Group, slug=group_slug)
-
-    projects_queryset = group.projects.accessible_to(request.user)
+def get_project_list(group, user, order_by, display_all_projects):
+    projects_queryset = group.projects.accessible_to(user)
     projects_queryset = projects_queryset.annotate(latest_build_id=Max('builds__id'))
 
-    if request.user.is_authenticated:
-        projects_queryset = projects_queryset.prefetch_related(Prefetch('subscriptions', queryset=Subscription.objects.filter(user=request.user), to_attr='user_subscriptions'))
+    if user.is_authenticated:
+        projects_queryset = projects_queryset.prefetch_related(Prefetch('subscriptions', queryset=Subscription.objects.filter(user=user), to_attr='user_subscriptions'))
 
-    order_by = request.GET.get('order', 'last_updated')
     if group.get_setting('SORT_PROJECTS_BY_NAME'):
         order_by = 'by_name'
 
     elif order_by == 'last_updated':
         projects_queryset = projects_queryset.order_by('-datetime')
 
-    display_all_projects = request.GET.get('all_projects') is not None
     num_projects = group.get_setting('DEFAULT_PROJECT_COUNT')
+
+    show_projects_active_n_days_ago = group.get_setting('SHOW_PROJECTS_ACTIVE_N_DAYS_AGO')
+    if show_projects_active_n_days_ago:
+        earilest_timestamp = timezone.now() - relativedelta(days=show_projects_active_n_days_ago)
+        latest_project_count = projects_queryset.filter(datetime__gte=earilest_timestamp).count()
+        if latest_project_count > 0:
+            projects_queryset = projects_queryset.filter(datetime__gte=earilest_timestamp)
+            # Ignore DEFAULT_PROJECT_COUNT if we are using age of project
+            num_projects = None
+
     if display_all_projects or num_projects is None:
         display_all_projects = True
         projects = projects_queryset.all()
@@ -108,6 +117,16 @@ def group_home(request, group_slug):
         display_all_projects = projects_queryset.count() <= num_projects
         projects = projects_queryset.all()[:num_projects]
 
+    return projects
+
+
+def group_home(request, group_slug):
+    group = get_object_or_404(Group, slug=group_slug)
+
+    order_by = request.GET.get('order', 'last_updated')
+    display_all_projects = request.GET.get('all_projects') is not None
+    projects = get_project_list(group, request.user, order_by, display_all_projects)
+
     has_archived_projects = False
     latest_build_ids = {}
     projects_count = 0
@@ -157,7 +176,7 @@ def project_home(request, group_slug, project_slug):
     builds = [b for b in __get_builds_with_status__(project, 11)]
     last_build = len(builds) and builds[0] or None
 
-    metadata = last_build and sorted(last_build.important_metadata.items()) or ()
+    metadata = last_build and last_build.important_metadata.items() or ()
     context = {
         'project': project,
         'builds': builds,
@@ -379,7 +398,7 @@ def build(request, group_slug, project_slug, version):
         'build': build,
         'test_results': test_results,
         'results_layout': results_layout,
-        'metadata': sorted(build.important_metadata.items()),
+        'metadata': build.important_metadata.items(),
         'has_extra_metadata': build.has_extra_metadata,
         'failures_only': failures_only,
         'testjobs_progress': testjobs_progress,

squad/settings.py

@@ -81,6 +81,14 @@ except ImportError:
     pass
 
 
+django_allauth_middleware = None
+try:
+    import allauth.account.middleware  # noqa: F401
+    django_allauth_middleware = 'allauth.account.middleware.AccountMiddleware'
+except ImportError:
+    pass
+
+
 __apps__ = [
     'django.contrib.admin',
     'django.contrib.auth',
@@ -146,6 +154,7 @@ __middlewares__ = [
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     django_toolbar_middleware,  # OPTIONAL
+    django_allauth_middleware,
 ]
 
 MIDDLEWARE = [middleware for middleware in __middlewares__ if middleware]

squad/version.py

@@ -1 +1 @@
-__version__ = '1.74'
+__version__ = '1.75'

{squad-1.74.dist-info → squad-1.75.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: squad
-Version: 1.74
+Version: 1.75
 Summary: Software Quality Dashboard
 Home-page: https://github.com/Linaro/squad
 Author: Antonio Terceiro

{squad-1.74.dist-info → squad-1.75.dist-info}/RECORD

@@ -7,17 +7,17 @@ squad/http.py,sha256=KuIKtpf3yOvf5fwc0T2MR0ul1l4AKxq3b0CLdk6KBhM,3667
 squad/jinja2.py,sha256=OKX-lzNz6qtTZL56HWv4UBMPuBl4WQXv0qFJztGp9zs,2541
 squad/mail.py,sha256=xH5wuIpD7u1fTN9vNOcbzByojleaffsKwp-9i3BeOD0,390
 squad/manage.py,sha256=Z-LXT67p0R-IzwJ9fLIAacEZmU0VUjqDOSg7j2ZSxJ4,1437
-squad/settings.py,sha256=8IuKnLnrgaTcotaLA-LIbDFVgmAiPqzMQfl5h3F0-58,14097
+squad/settings.py,sha256=6pEhWkjPgdRS4H2u3BKkPQJGs7oFy8Nbgk3KfhMR7hk,14328
 squad/socialaccount.py,sha256=vySqPwQ3qVVpahuJ-Snln8K--yzRL3bw4Nx27AsB39A,789
 squad/urls.py,sha256=JiEfVW8YlzLPE52c2aHzdn5kVVKK4o22w8h5KOA6QhQ,2776
-squad/version.py,sha256=hk3bRYhpJeAKv63C_jpKjb80t-uOh4QIP5iQeZZmnU4,21
+squad/version.py,sha256=OC6GKMpskxHfSEgiJ0ItR5gLS6QXMDmVsSkmSs2egUw,21
 squad/wsgi.py,sha256=SF8T0cQ0OPVyuYjO5YXBIQzvSXQHV0M2BTmd4gP1rPs,387
 squad/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 squad/api/apps.py,sha256=Trk72p-iV1uGn0o5mdJn5HARUoHGbfgO49jwXvpkmdQ,141
 squad/api/ci.py,sha256=g9ZodQW3A1scNci3K3EGprxSyW3rL9xn-qBYxd-_8ns,6462
 squad/api/data.py,sha256=obKDV0-neEvj5lPF9VED2gy_hpfhGtLJABYvSY38ing,2379
 squad/api/filters.py,sha256=Zvp8DCJmiNquFWqvfVseEAAMYYPiT95RUjqKdzcqSnw,6917
-squad/api/rest.py,sha256=d9KBEjX7ru8MZqOWptIwMnC1t_kmm6Tqp1xv61LntUE,75953
+squad/api/rest.py,sha256=EfpWljAvkkDwurRNoR1H6hRtYjpIS0B4kzXsQgS4UW8,75932
 squad/api/urls.py,sha256=rmsdaL1uOCVSZ5x1redup9RliICmijaBjRK5ObsTkG8,1343
 squad/api/utils.py,sha256=Sa8QFId3_oSqD2UOoY3Kuh54LLDLPNMq2sub5ktd6Fs,1160
 squad/api/views.py,sha256=yGLUp6RtNI5vuae6cOStMuUpSia46LcEVam3eMXmEqY,3885
@@ -25,14 +25,14 @@ squad/ci/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 squad/ci/admin.py,sha256=7yB-6F0cvt0NVvzGOTlZCyGPV_YHarmbKJZTTzataT4,2255
 squad/ci/apps.py,sha256=6OVnzTdJkxdqEJnKWYE9dZgUcc29_T1LrDw41cK4EQk,139
 squad/ci/exceptions.py,sha256=a1sccygniTYDSQi7FRn_6doapddFFiMf55AwGUh5Y80,227
-squad/ci/models.py,sha256=RoXJY4Xgu3-YA4FtcK-kem8HR8paqOb5648NByAlzDo,12325
+squad/ci/models.py,sha256=R8kdrbkcplABeTZPSWADL2dOQsWbSfgfOh5jZltKK-8,13265
 squad/ci/tasks.py,sha256=yrtxfPuYEqqGCDYRwLz2XyIp9a7LJ-K6Zm3VS1ymdZk,2728
 squad/ci/utils.py,sha256=38zHpw8xkZDSFlkG-2BwSK6AkcddK9OkN9LXuQ3SHR0,97
 squad/ci/backend/__init__.py,sha256=yhpotXT9F4IdAOXvGQ3-17eOHAFwoaqf9SnMX17ab30,534
 squad/ci/backend/fake.py,sha256=zzOXGesDCW9xiMQvXGD_jqCQF32yEd7hPM8DgfZxUok,2159
 squad/ci/backend/lava.py,sha256=5KEXFwKGjzXPPe7_rzMGF7YShYCLwmooTc8tQUpGBSM,33076
 squad/ci/backend/null.py,sha256=vP77Xj7roruehSjX8fJs7xK2aWxgaUA2id3P8nHNrEY,4949
-squad/ci/backend/tuxsuite.py,sha256=wILo_rUfIYtL3yfctr-uX8eMUmcfJdfq15xEEXVM64o,15552
+squad/ci/backend/tuxsuite.py,sha256=yAdLBOC3uLL2-wYxCsd8Rnk6lzTQLHcl2UOUjjJHYBg,16606
 squad/ci/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 squad/ci/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 squad/ci/management/commands/create_tuxsuite_boot_tests.py,sha256=JvjNusebLX71eyz9d-kaeCyekYSpzc1eXoeIqWK9ygo,4045
@@ -80,7 +80,7 @@ squad/core/comparison.py,sha256=LR3-Unv0CTmakFCDzF_h8fm2peTJzkv79mQWNau1iwI,2442
 squad/core/data.py,sha256=2zw56v7iYRTUc7wlhuUNgwIIMmK2w84hi-amR9J7EPU,2236
 squad/core/failures.py,sha256=X6lJVghM2fOrd-RfuHeLlezW2pt7owDZ8eX-Kn_Qrt0,918
 squad/core/history.py,sha256=APIgJ1fXAGyxoNgxVMn02kJzXhLR1x2SG4UyCcTyUEQ,3467
-squad/core/models.py,sha256=wJ-0e5JNPxBendEMOk9YdxLH03tvikDAeGjzDcuSCxw,60343
+squad/core/models.py,sha256=E3E78ftWCYEqBz3ePyNf1wM5lfYRotjqdchfyWMZpRs,60346
 squad/core/notification.py,sha256=rOpO6F63w7_5l9gQgWBBEk-MFBjp7x_hVzoVIVyDze0,10030
 squad/core/plugins.py,sha256=PzgKrRvnwoe4ynLh0aRGAsL0CngHSu8dose37CO5ESg,5992
 squad/core/queries.py,sha256=78fhIJZWXIlDryewYAt96beK1VJad66Ufu8cg3dHh4w,7698
@@ -306,7 +306,7 @@ squad/frontend/tests.py,sha256=q64Z6DyS6TiJTCzF6SXw4wZfvXR8c0A4t-f0ib1jJ0w,8713
 squad/frontend/urls.py,sha256=biWauxwXR5j9kOfrSUqkv1Iqz-elB2aNViS9_UFoLzQ,4882
 squad/frontend/user_settings.py,sha256=IBogLusn-WNQiXqc_cF23s_tAWZ6wYVL6bbCfah_Aco,4189
 squad/frontend/utils.py,sha256=DeH58CJUI1dovpQrj3a-DcxNzM0cxsnBDOF0mrC4Qws,1364
-squad/frontend/views.py,sha256=n4Xll_gRBHOLV1pki6DZpXgkYsNGWhtiu2fruGEZ9iI,25695
+squad/frontend/views.py,sha256=wK7ZPD-qjdhNTaBNJAZAwYmRTmIaHdjRxLiD6Oe9k1w,26477
 squad/frontend/locale/django.pot,sha256=ENSJCBcxS2gWg5byPCMxU8gvTNR6qtJdsSi9emUUOvY,30178
 squad/frontend/locale/pl/LC_MESSAGES/django.po,sha256=yKoZEDP72mn_5WSNDP8zh5Pl3Z5Z9OGuoDG159NPvEI,36297
 squad/frontend/locale/pt/LC_MESSAGES/django.po,sha256=8srHMXuXV0ZuUM284LEwTb5sXWEMzlCmul1lKXsDZc8,36375
@@ -428,9 +428,9 @@ squad/run/__main__.py,sha256=DOl8JOi4Yg7DdtwnUeGqtYBJ6P2k-D2psAEuYOjWr8w,66
 squad/run/listener.py,sha256=jBeOQhPGb4EdIREB1QsCzYuumsfJ-TqJPd3nR-0m59g,200
 squad/run/scheduler.py,sha256=CDJG3q5C0GuQuxwlMOfWTSSJpDdwbR6rzpbJfuA0xuw,277
 squad/run/worker.py,sha256=jtML0h5qKDuSbpJ6_rpWP4MT_rsGA7a24AhwGxBquzk,594
-squad-1.74.dist-info/COPYING,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
-squad-1.74.dist-info/METADATA,sha256=6eAK6LZ4Cba9SY_SyjKNnlGeg-aB-pepP-slkiBz0pk,1245
-squad-1.74.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-squad-1.74.dist-info/entry_points.txt,sha256=apCDQydHZtvqV334ql6NhTJUAJeZRdtAm0TVcbbAi5Q,194
-squad-1.74.dist-info/top_level.txt,sha256=_x9uqE1XppiiytmVTl_qNgpnXus6Gsef69HqfliE7WI,6
-squad-1.74.dist-info/RECORD,,
+squad-1.75.dist-info/COPYING,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+squad-1.75.dist-info/METADATA,sha256=tnDoktc6-u7r6X5n5HGdAk1sxjAQYXptjBuWrtSjN_w,1245
+squad-1.75.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+squad-1.75.dist-info/entry_points.txt,sha256=apCDQydHZtvqV334ql6NhTJUAJeZRdtAm0TVcbbAi5Q,194
+squad-1.75.dist-info/top_level.txt,sha256=_x9uqE1XppiiytmVTl_qNgpnXus6Gsef69HqfliE7WI,6
+squad-1.75.dist-info/RECORD,,