squad 1.83__py3-none-any.whl → 1.85__py3-none-any.whl

squad/api/ci.py

@@ -106,6 +106,16 @@ def watch_job(request, group_slug, project_slug, version, environment_slug):
         job_id=testjob_id
     )
 
+    # check if backend is able to fetch job definition
+    try:
+        definition = backend.get_job_definition(testjob_id)
+        if not definition:
+            return HttpResponseBadRequest(f"No job definition found for job {testjob_id}: {definition}")
+        test_job.definition = definition
+    except NotImplementedError:
+        # backend does not work with job definitions
+        pass
+
     # sanitize job_url
     try:
         backend.get_implementation().job_url(test_job)

squad/api/rest.py

@@ -227,7 +227,7 @@ class TestFilter(filters.FilterSet):
 
     class Meta:
         model = Test
-        fields = {'result': ['exact', 'in'],
+        fields = {'result': ['exact', 'in', 'isnull'],
                   'suite_id': ['exact', 'in'],
                   'environment_id': ['exact', 'in'],
                   'metadata_id': ['exact', 'in'],
@@ -1880,13 +1880,14 @@ router.register(r'projects', ProjectViewSet).register(
     parents_query_lookups=['project_id'],
     **drf_basename('project-builds')
 )
-router.register(r'builds', BuildViewSet).register(
+builds = router.register(r'builds', BuildViewSet)
+builds.register(
     r'tests',
     TestViewSet,
     parents_query_lookups=['build_id'],
     **drf_basename('build-tests')
 )
-router.register(r'builds', BuildViewSet).register(
+builds.register(
     r'metrics',
     MetricViewSet,
     parents_query_lookups=['build_id'],

squad/ci/backend/fake.py

@@ -60,11 +60,20 @@ class Backend(object):
     def job_url(self, test_job):
         return 'https://example.com/job/%s' % test_job.job_id
 
+    def has_resubmit(self):
+        return False
+
+    def has_cancel(self):
+        return True
+
     def cancel(self, test_job):
         return True
 
     def check_job_definition(self, definition):
         return True
 
+    def get_job_definition(self, test_job):
+        return "sample job definition"
+
     def supports_callbacks(self):
         return False

squad/ci/backend/lava.py

@@ -106,6 +106,9 @@ class Backend(BaseBackend):
             return job_id
         return [job_id]
 
+    def has_cancel(self):
+        return True
+
     def cancel(self, test_job):
         if test_job.submitted and test_job.job_id is not None:
             return self.__cancel_job__(test_job.job_id)
@@ -329,6 +332,9 @@ class Backend(BaseBackend):
         scheme = socket_url.scheme
         return '%s://%s:%s' % (scheme, hostname, port)
 
+    def has_resubmit(self):
+        return True
+
     def resubmit(self, test_job):
         with self.handle_job_submission():
             new_job_id_list = self.__resubmit__(test_job.job_id)
@@ -775,3 +781,14 @@ class Backend(BaseBackend):
             return True
         except yaml.YAMLError as e:
             return str(e)
+
+    def get_job_definition(self, job_id):
+        if self.use_xml_rpc:
+            return self.proxy.scheduler.jobs.definition(job_id)
+        job_resp = requests.get(
+            f'{self.api_url_base}/jobs/{job_id}/definition/',
+            headers=self.authentication,
+            timeout=self.settings.get(timeout_variable_name, DEFAULT_TIMEOUT)
+        )
+        if job_resp.status_code == 200:
+            return job_resp.json()

squad/ci/backend/null.py

@@ -8,7 +8,7 @@ logger = logging.getLogger('squad.ci.backend')
 description = "None"
 
 
-class Backend(object):
+class Backend:
 
     """
     This is the interface that all backends must implement. Depending on the
@@ -39,6 +39,13 @@ class Backend(object):
         """
         raise NotImplementedError
 
+    def has_resubmit(self):
+        """
+        If the backend has a resubmit method implemented, override this to
+        return True.
+        """
+        return False
+
     def resubmit(self, test_job):
         """
         Re-submits given test job to the backend service
@@ -84,6 +91,13 @@ class Backend(object):
         """
         raise NotImplementedError
 
+    def has_cancel(self):
+        """
+        If the backend has a cancel method implemented, override this to
+        return True.
+        """
+        return False
+
     def cancel(self, test_job):
         """
         Cancels the job if the backend allows it. It will not raise any
@@ -92,18 +106,24 @@ class Backend(object):
         """
         raise NotImplementedError
 
-    def job_url(selt, test_job):
+    def job_url(self, test_job):
         """
         Returns the URL of the test job in the backend
         """
         raise NotImplementedError
 
-    def check_job_definition(selt, definition):
+    def check_job_definition(self, definition):
         """
         Returns True if job definition checks out or an error message
         """
         raise NotImplementedError
 
+    def get_job_definition(self, job_id):
+        """
+        Returns the job definition for a given test job
+        """
+        raise NotImplementedError
+
     def supports_callbacks(self):
         """
         Returns True if this backend supports callbacks, False otherwise

squad/ci/backend/tuxsuite.py

@@ -32,6 +32,11 @@ requests_session = None
 
 
 class Backend(BaseBackend):
+    def has_resubmit(self):
+        return False
+
+    def has_cancel(self):
+        return True
 
     @staticmethod
     def get_session():

squad/ci/models.py

@@ -216,6 +216,9 @@ class Backend(models.Model):
     def check_job_definition(self, definition):
         return self.get_implementation().check_job_definition(definition)
 
+    def get_job_definition(self, job_id):
+        return self.get_implementation().get_job_definition(job_id)
+
     def supports_callbacks(self):
         return self.get_implementation().supports_callbacks()
 
@@ -379,7 +382,7 @@ class TestJob(models.Model):
         if self.job_status == "Canceled":
             return False
 
-        if self.job_id is not None:
+        if self.job_id is not None and self.backend.get_implementation().has_cancel():
             return self.backend.get_implementation().cancel(self)
 
         self.fetched = True

squad/frontend/templates/squad/testjobs.jinja2

@@ -56,7 +56,7 @@
     <div class='pull-right clearfix' ng-controller='CancelController' title="{{ _('Cancel all jobs') }}">
         <a class="btn" ng-click="cancel_all({{ build.id }})" ng-class="{'btn-info': !done, 'btn-success': done, 'btn-danger': error}" ng-disabled="done" >
 	    <span ng-class="{'fa':true, 'fa-recycle':!done, 'fa-check': done && !error, 'fa-spin': loading, 'fa-close': error}" ng-disabled="done"></span>
-	    {{ _('Cancell all jobs') }}
+	    {{ _('Cancel all jobs') }}
 	</a>
     </div>
     <br />
@@ -107,7 +107,7 @@
                                 ng-class="{'fa':true, 'fa-recycle':!done, 'fa-check': done && !error, 'fa-spin': loading, 'fa-close': error}"
                                 ng-disabled="done">
                             </span>
-                            {{ _('%s - manual fetch')  % testjob.job_id }}
+                            {{ _('manual fetch') }}
                         </a>
                     </div>
                     {% endif %}
@@ -122,11 +122,12 @@
                                 ng-class="{'fa':true, 'fa-recycle':!done, 'fa-check': done && !error, 'fa-spin': loading, 'fa-close': error}"
                                 ng-disabled="done">
                             </span>
-                            {{ _('%s - cancel')  % testjob.job_id }}
+                            {{ _('cancel %s') % testjob.backend.get_implementation().has_cancel() }}
                         </a>
                     </div>
                     {% endif %}
                     <div class='pull-right' ng-controller='ResubmitController'>
+                        {% if testjob.backend.get_implementation().has_resubmit() %}
                         <a
                             class="btn"
                             ng-click="resubmit({{testjob.id}}, true)"
@@ -138,9 +139,10 @@
                                 ng-disabled="done"
                                 title="{{ _('Resubmit job no matter the status') }}">
                             </span>
-                            {{ _('%s - force resubmit') % testjob.job_id }}
+                            {{ _('force resubmit') }}
                         </a>
-                        {% if testjob.can_resubmit %}
+                        {% endif %}
+                        {% if testjob.can_resubmit and testjob.backend.get_implementation().has_resubmit() %}
                         <a
                             class="btn"
                             ng-click="resubmit({{testjob.id}}, false)"
@@ -152,7 +154,7 @@
                                 ng-disabled="done"
                                 title="{{ _('Resubmit job') }}">
                             </span>
-                            {{ _('%s - resubmit') % testjob.job_id }}
+                            {{ _('resubmit') }}
                         </a>
                         {% endif %}
                     </div>

squad/version.py

@@ -1 +1 @@
-__version__ = '1.83'
+__version__ = '1.85'

{squad-1.83.dist-info → squad-1.85.dist-info}/METADATA

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

{squad-1.83.dist-info → squad-1.85.dist-info}/RECORD

@@ -10,14 +10,14 @@ squad/manage.py,sha256=Z-LXT67p0R-IzwJ9fLIAacEZmU0VUjqDOSg7j2ZSxJ4,1437
 squad/settings.py,sha256=Wzg1nS96OKZ38qEXtIat9XaZc1HigUJr3ktMuwVhf98,14546
 squad/socialaccount.py,sha256=vySqPwQ3qVVpahuJ-Snln8K--yzRL3bw4Nx27AsB39A,789
 squad/urls.py,sha256=JiEfVW8YlzLPE52c2aHzdn5kVVKK4o22w8h5KOA6QhQ,2776
-squad/version.py,sha256=LPPmnaZuDWGRpyKlfjX-DBavQIRhxulpzwJOqWSru8E,21
+squad/version.py,sha256=XHedXngbS7mTJ6PRZZiqQufUZV1aZtCSDF-zEyvtXKg,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=D8kgv2yTKGBzUBE65m4jNWR0O8_NNV7vQGXMvYGKaBE,6547
+squad/api/ci.py,sha256=ymG-eMKXpJgrVUiZcqJW-dYZQKvm1LkdR3TUMe4OSoM,6943
 squad/api/data.py,sha256=obKDV0-neEvj5lPF9VED2gy_hpfhGtLJABYvSY38ing,2379
 squad/api/filters.py,sha256=Zvp8DCJmiNquFWqvfVseEAAMYYPiT95RUjqKdzcqSnw,6917
-squad/api/rest.py,sha256=QRUFw5Tb8sSbniFIi-HToeVDVn6CzG2NQdovYW1FyTE,77105
+squad/api/rest.py,sha256=mbQQsOB-bdNGfQ76sbGxBgNRi9CMd99SNMQpda5DknY,77097
 squad/api/urls.py,sha256=rmsdaL1uOCVSZ5x1redup9RliICmijaBjRK5ObsTkG8,1343
 squad/api/utils.py,sha256=Sa8QFId3_oSqD2UOoY3Kuh54LLDLPNMq2sub5ktd6Fs,1160
 squad/api/views.py,sha256=kuFlbiyZiD0i9jwwmkL3Y22LwJ3bx2oJs28d1g2DPA0,3898
@@ -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=Jf5mg2QRHIB5KKwpTU5MVZ8ZYQqmpcIz9lgE8Dhd13A,15856
+squad/ci/models.py,sha256=Fm-4b3SDgMh9HXzqjOd4iZDRMJ1D9AnZ2cg7i2OR248,16018
 squad/ci/tasks.py,sha256=xoiOyh0HKLiKsAnQbolMRq4E9RcvP4xFgR0S9d_bgm4,3782
 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=XnV5ee9eSSKyxZDO-pXibpP_TU4iCBHA8opaZ_3upXk,17296
+squad/ci/backend/fake.py,sha256=9sPKndsGd5GDNPp35v-zfJWXZCbge-yXH3RBQGgTlPk,2340
+squad/ci/backend/lava.py,sha256=EXwEksjdOi_ZrUoMkBTyxVjqVOnJvEFNg_LWqUKaIgA,33607
+squad/ci/backend/null.py,sha256=0CVylWELIZw3JyzCROB4XXAjgQUi15YjQz5caRfTNBo,5434
+squad/ci/backend/tuxsuite.py,sha256=Qz-zHyElU7K-oRT_DOlORaD_lR1HJC2JoHnLPZKfl60,17392
 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
@@ -394,7 +394,7 @@ squad/frontend/templates/squad/test_run_suite_metrics.jinja2,sha256=WGjlObw7ZTGo
 squad/frontend/templates/squad/test_run_suite_test_details.jinja2,sha256=HGGnxDoFpyPgiH34aIVRrQysLn7KLYtDITUeQikYOoY,5657
 squad/frontend/templates/squad/test_run_suite_tests.jinja2,sha256=S5VJMIoc18W46iHtSSLYC_3C3Wj1saXU83wR-JvF8GI,935
 squad/frontend/templates/squad/testjob.jinja2,sha256=hQLavgkYJ3qAKJMG7cHnmJGC1jdwCnox2w9oQvLzn7U,324
-squad/frontend/templates/squad/testjobs.jinja2,sha256=eanRBdFf4aBbSAwNr_ZObTWFnk407bvBYEbj675zsJI,9491
+squad/frontend/templates/squad/testjobs.jinja2,sha256=a90ltfoIWORB4i1mubA3cfQzX1IoSMqhYpAUc38RZSk,9632
 squad/frontend/templates/squad/testjobs_progress.jinja2,sha256=4_o53GOdcClRdiNQxPHwvXPI9Ia07gTJRu5SGrCJ7s4,2638
 squad/frontend/templates/squad/tests-details-nav.jinja2,sha256=WDi4vf0ctRK1dK1Z3IirBuyn5Dq9_qg_9A1P3GrB31U,664
 squad/frontend/templates/squad/tests.jinja2,sha256=2AaEoCHJiCzXu_36XOq0ihiGqxh_2U2w88dheBlIwy8,4970
@@ -431,9 +431,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.83.dist-info/COPYING,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
-squad-1.83.dist-info/METADATA,sha256=NSZ-uCzSBCL6pyxeK-MNfQfpC_mx36gO4w9CtBe1PbQ,1234
-squad-1.83.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-squad-1.83.dist-info/entry_points.txt,sha256=apCDQydHZtvqV334ql6NhTJUAJeZRdtAm0TVcbbAi5Q,194
-squad-1.83.dist-info/top_level.txt,sha256=_x9uqE1XppiiytmVTl_qNgpnXus6Gsef69HqfliE7WI,6
-squad-1.83.dist-info/RECORD,,
+squad-1.85.dist-info/COPYING,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+squad-1.85.dist-info/METADATA,sha256=1m8I9voN8Y6StBv8TUFvk2-eFN-EZegBK9YTNy7jXTI,1234
+squad-1.85.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+squad-1.85.dist-info/entry_points.txt,sha256=apCDQydHZtvqV334ql6NhTJUAJeZRdtAm0TVcbbAi5Q,194
+squad-1.85.dist-info/top_level.txt,sha256=_x9uqE1XppiiytmVTl_qNgpnXus6Gsef69HqfliE7WI,6
+squad-1.85.dist-info/RECORD,,

{squad-1.83.dist-info → squad-1.85.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any