squad 1.93.6__tar.gz → 1.94.1__tar.gz

{squad-1.93.6 → squad-1.94.1}/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 1.94.1
+
+This release adds a minor performance improvement fix.
+
+# 1.94
+
+This release adds support for cleaning data of testruns that were stopped in the middle of fetching due to some
+temporarily infra error.
+
 # 1.93.6
 
 This release adds pytz as in the default docker image as it is used in some deployments of SQUAD.

{squad-1.93.6/squad.egg-info → squad-1.94.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: squad
-Version: 1.93.6
+Version: 1.94.1
 Summary: Software Quality Dashboard
 Home-page: https://gitlab.com/Linaro/squad/squad
 Author: Antonio Terceiro

{squad-1.93.6 → squad-1.94.1}/squad/api/rest.py

@@ -1767,11 +1767,20 @@ class TestJobViewSet(ModelViewSet):
 
     @action(detail=True, methods=['post'], suffix='fetch')
     def fetch(self, request, **kwargs):
+        clean_testrun = request.data.get('clean_testrun') is not None
+
         testjob = self.get_object()
         testjob.fetched = False
         testjob.fetch_attempts = 0
-        testjob.save()
-        fetch.delay(testjob.id)
+        testjob.subtasks_count = 0
+        testjob.job_status = None
+        testjob.save(update_fields=[
+            'fetched',
+            'fetch_attempts',
+            'subtasks_count',
+            'job_status',
+        ])
+        fetch.delay(testjob.id, clean_testrun=clean_testrun)
         log_change(request, testjob, "Testjob queued for fetching")
         return Response({'job_id': testjob.job_id, 'status': 'Queued for fetching'}, status=status.HTTP_200_OK)
 

{squad-1.93.6 → squad-1.94.1}/squad/ci/tasks.py

@@ -25,10 +25,19 @@ def poll(backend_id=None):
 
 
 @celery.task
-def fetch(job_id):
+def fetch(job_id, clean_testrun=False):
     logger.info("fetching %s" % job_id)
+
     try:
         testjob = TestJob.objects.get(pk=job_id)
+        if clean_testrun and testjob.testrun:
+            logger.info("clean_testrun=True, cleaning job's testrun")
+            testrun = testjob.testrun
+            testjob.testrun = None
+            testjob.save()
+
+            testrun.delete()
+
         if testjob.job_id:
             testjob.backend.fetch(testjob.id)
     except TestJob.DoesNotExist:

{squad-1.93.6 → squad-1.94.1}/squad/core/tasks/__init__.py

@@ -224,7 +224,7 @@ class ParseTestRunData(object):
         ], ignore_conflicts=True)
 
         suites_metadata_ids = {
-            m.suite: m.id for m in SuiteMetadata.objects.filter(kind='suite', name='-', suite__in=suites_slugs)
+            m.suite: m.id for m in SuiteMetadata.objects.filter(name='-', suite__in=suites_slugs) if m.kind == 'suite'
         }
 
         Suite.objects.bulk_create([
@@ -253,13 +253,15 @@ class ParseTestRunData(object):
         metadata_ids = {}
         metadata_names = {}
         metadatas = SuiteMetadata.objects.filter(
-            kind='test',
             name__in=[
                 t['test_name'] for t in tests_batch.values()
             ]
         ).all()
 
         for metadata in metadatas:
+            if metadata.kind != 'test':
+                continue
+
             full_name = join_name(metadata.suite, metadata.name)
             metadata_ids[full_name] = metadata.id
             metadata_names[metadata.id] = full_name

{squad-1.93.6 → squad-1.94.1}/squad/frontend/static/squad/controllers/fetch.js

@@ -7,7 +7,7 @@ export function FetchController($scope, $http, $timeout) {
         if ($scope.done) return
         $scope.loading = true
 
-        $http.post("/api/testjobs/" + test_job_id + "/fetch/").then(
+        $http.post("/api/testjobs/" + test_job_id + "/fetch/", {"clean_testrun": true}).then(
             function(response) {
                 $timeout(function() {
                     $scope.loading = false

squad-1.94.1/squad/version.py

@@ -0,0 +1 @@
+__version__ = '1.94.1'

{squad-1.93.6 → squad-1.94.1/squad.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: squad
-Version: 1.93.6
+Version: 1.94.1
 Summary: Software Quality Dashboard
 Home-page: https://gitlab.com/Linaro/squad/squad
 Author: Antonio Terceiro

{squad-1.93.6 → squad-1.94.1}/test/api/test_rest.py

@@ -1269,7 +1269,15 @@ class RestApiTest(APITestCase):
         self.assertEqual(data.status_code, 200)
         self.assertEqual(data.json()['job_id'], self.testjob5.job_id)
         self.assertEqual(data.json()['status'], 'Queued for fetching')
-        fetch_task.assert_called_with(self.testjob5.id)
+        fetch_task.assert_called_with(self.testjob5.id, clean_testrun=False)
+
+    @patch('squad.ci.tasks.fetch.delay')
+    def test_testjob_fetch_clean_testrun(self, fetch_task):
+        data = self.post('/api/testjobs/%d/fetch/' % self.testjob5.id, {'clean_testrun': True})
+        self.assertEqual(data.status_code, 200)
+        self.assertEqual(data.json()['job_id'], self.testjob5.job_id)
+        self.assertEqual(data.json()['status'], 'Queued for fetching')
+        fetch_task.assert_called_with(self.testjob5.id, clean_testrun=True)
 
     def test_testjob_backend_filter(self):
         data = self.get('/api/testjobs/?backend__implementation_type=fake')

{squad-1.93.6 → squad-1.94.1}/test/ci/test_tasks.py

@@ -138,6 +138,17 @@ class FetchTest(TestCase):
         fetch.apply(args=[99999999999])
         fetch_method.assert_not_called()
 
+    @patch('squad.ci.models.Backend.fetch')
+    def test_fetch_clean_testrun(self, fetch_method):
+        env = self.test_job.target.environments.create(slug="myenv")
+        self.test_job.testrun = self.test_job.target_build.test_runs.create(environment=env)
+        self.test_job.save()
+        clean_testrun = True
+        fetch.apply(args=[self.test_job.id, clean_testrun])
+        fetch_method.assert_called_with(self.test_job.id)
+        self.test_job.refresh_from_db()
+        self.assertIsNone(self.test_job.testrun)
+
 
 class FetchTestRaceCondition(TransactionTestCase):
 

squad-1.93.6/squad/version.py

@@ -1 +0,0 @@
-__version__ = '1.93.6'