squad 1.94.1__tar.gz → 1.95__tar.gz

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

@@ -1,3 +1,7 @@
+# 1.95
+
+This release collects log snippets for Tuxsuite backend.
+
 # 1.94.1
 
 This release adds a minor performance improvement fix.

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: squad
-Version: 1.94.1
+Version: 1.95
 Summary: Software Quality Dashboard
 Home-page: https://gitlab.com/Linaro/squad/squad
 Author: Antonio Terceiro
@@ -48,6 +48,7 @@ Dynamic: author-email
 Dynamic: description
 Dynamic: home-page
 Dynamic: license
+Dynamic: license-file
 Dynamic: platform
 Dynamic: provides-extra
 Dynamic: requires-dist

{squad-1.94.1 → squad-1.95}/scripts/rabbitmq-server

@@ -4,7 +4,7 @@ set -eu
 
 # Starts a local rabbitmq server if there is none running already
 
-if pgrep -fa rabbitmq_server >/dev/null; then
+if pgrep -fa erlang.*rabbitmq >/dev/null; then
     echo "rabbitmq-server already running, no need for a new one"
     exec sleep infinity
 fi

{squad-1.94.1 → squad-1.95}/squad/ci/backend/tuxsuite.py

@@ -394,6 +394,7 @@ class Backend(BaseBackend):
 
         # Retrieve TuxRun log
         logs = self.fetch_url(job_url + '/', 'logs?format=txt').text
+        log_lines = logs.splitlines()
 
         attachment_list = ["reproducer", "tux_plan.yaml"]
         attachments = {}
@@ -407,7 +408,7 @@ class Backend(BaseBackend):
 
         # Create a boot test
         boot_test_name = 'boot/' + (metadata.get('build_name') or 'boot')
-        tests[boot_test_name] = results['results']['boot']
+        tests[boot_test_name] = {'result': results['results']['boot']}
 
         # Really fetch test results
         tests_results = self.fetch_url(job_url + '/', 'results').json()
@@ -420,10 +421,18 @@ class Backend(BaseBackend):
                 for name, test_data in suite_tests.items():
                     test_name = f'{suite_name}/{name}'
                     result = test_data['result']
-
-                    # TODO: Log lines are off coming from TuxRun/LAVA
-                    # test_log = self.get_test_log(log_dict, test)
-                    tests[test_name] = result
+                    if "starttc" in test_data:
+                        starttc = test_data["starttc"] - 1  # LAVA data counts from 1, we count from 0
+                        if "endtc" in test_data:
+                            # no -1 as the second index of the slice needs to be
+                            # greater than the first to get at least one item.
+                            endtc = test_data["endtc"]
+                        else:
+                            endtc = starttc + 2
+                        log_snippet = "\n".join(log_lines[starttc:endtc])
+                    else:
+                        log_snippet = None
+                    tests[test_name] = {"result": result, "log": log_snippet}
 
         return status, completed, metadata, tests, metrics, logs, attachments
 

{squad-1.94.1 → squad-1.95}/squad/ci/management/commands/listen.py

@@ -138,6 +138,9 @@ class Command(BaseCommand):
         backend_name = options.get("BACKEND")
         if backend_name:
             backend = Backend.objects.get(name=backend_name)
-            Listener(backend).run()
+            try:
+                Listener(backend).run()
+            except NotImplementedError:
+                logger.info('Backend %s: does not implement a listener' % backend.name)
         else:
             ListenerManager().run()

squad-1.95/squad/version.py

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

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: squad
-Version: 1.94.1
+Version: 1.95
 Summary: Software Quality Dashboard
 Home-page: https://gitlab.com/Linaro/squad/squad
 Author: Antonio Terceiro
@@ -48,6 +48,7 @@ Dynamic: author-email
 Dynamic: description
 Dynamic: home-page
 Dynamic: license
+Dynamic: license-file
 Dynamic: platform
 Dynamic: provides-extra
 Dynamic: requires-dist

{squad-1.94.1 → squad-1.95}/test/ci/backend/test_tuxsuite.py

@@ -900,7 +900,7 @@ class TuxSuiteTest(TestCase):
             results = self.tuxsuite.fetch(testjob)
             self.assertEqual(None, results)
 
-        test_logs = 'dummy test log'
+        test_logs = "\n".join([f"line {i}" for i in range(1, 1000)])
         test_results = {
             'project': 'tuxgroup/tuxproject',
             'device': 'qemu-armv7',
@@ -979,12 +979,14 @@ class TuxSuiteTest(TestCase):
             fake_request.get(urljoin(test_url + '/', 'tux_plan.yaml'), text='tux_plan.yaml contents')
 
             status, completed, metadata, tests, metrics, logs, attachments = self.tuxsuite.fetch(testjob)
+            tests_results = {k: v["result"] for k, v in tests.items()}
             self.assertEqual('Complete', status)
             self.assertTrue(completed)
             self.assertEqual(sorted(expected_metadata.items()), sorted(metadata.items()))
-            self.assertEqual(sorted(expected_tests.items()), sorted(tests.items()))
+            self.assertEqual(sorted(expected_tests.items()), sorted(tests_results.items()))
             self.assertEqual(sorted(expected_metrics.items()), sorted(metrics.items()))
             self.assertEqual(test_logs, logs)
+            self.assertEqual("line 958", tests["ltp-smoke/access01"]["log"])
 
         self.assertEqual('ltp-smoke', testjob.name)
 
@@ -1080,10 +1082,11 @@ class TuxSuiteTest(TestCase):
             fake_request.get(urljoin(test_url + '/', 'tux_plan.yaml'), text='tux_plan.yaml contents')
 
             status, completed, metadata, tests, metrics, logs, attachments = self.tuxsuite.fetch(testjob)
+            tests_results = {k: v["result"] for k, v in tests.items()}
             self.assertEqual('Complete', status)
             self.assertTrue(completed)
             self.assertEqual(sorted(expected_metadata.items()), sorted(metadata.items()))
-            self.assertEqual(sorted(expected_tests.items()), sorted(tests.items()))
+            self.assertEqual(sorted(expected_tests.items()), sorted(tests_results.items()))
             self.assertEqual(sorted(expected_metrics.items()), sorted(metrics.items()))
             self.assertEqual(test_logs, logs)
             self.assertEqual('new-env-name', testjob.environment)
@@ -1165,10 +1168,11 @@ class TuxSuiteTest(TestCase):
             fake_request.get(urljoin(test_url + '/', 'tux_plan.yaml'), text='tux_plan.yaml contents')
 
             status, completed, metadata, tests, metrics, logs, attachments = self.tuxsuite.fetch(testjob)
+            tests_results = {k: v["result"] for k, v in tests.items()}
             self.assertEqual('Complete', status)
             self.assertTrue(completed)
             self.assertEqual(sorted(expected_metadata.items()), sorted(metadata.items()))
-            self.assertEqual(sorted(expected_tests.items()), sorted(tests.items()))
+            self.assertEqual(sorted(expected_tests.items()), sorted(tests_results.items()))
             self.assertEqual(sorted(expected_metrics.items()), sorted(metrics.items()))
             self.assertEqual(test_logs, logs)
 
@@ -1264,10 +1268,11 @@ class TuxSuiteTest(TestCase):
             fake_request.get(test_url, json=job_data)
 
             status, completed, metadata, tests, metrics, logs, attachments = self.tuxsuite.fetch(testjob)
+            tests_results = {k: v["result"] for k, v in tests.items()}
             self.assertEqual('Complete', status)
             self.assertTrue(completed)
             self.assertEqual(sorted(expected_metadata.items()), sorted(metadata.items()))
-            self.assertEqual(sorted(expected_tests.items()), sorted(tests.items()))
+            self.assertEqual(sorted(expected_tests.items()), sorted(tests_results.items()))
             self.assertEqual(sorted(expected_metrics.items()), sorted(metrics.items()))
             self.assertEqual(test_logs, logs)
 
@@ -1365,10 +1370,11 @@ class TuxSuiteTest(TestCase):
             fake_request.get(urljoin(test_url + '/', 'tux_plan.yaml'), text='tux_plan.yaml contents')
 
             status, completed, metadata, tests, metrics, logs, attachments = self.tuxsuite.fetch(testjob)
+            tests_results = {k: v["result"] for k, v in tests.items()}
             self.assertEqual('Complete', status)
             self.assertTrue(completed)
             self.assertEqual(sorted(expected_metadata.items()), sorted(metadata.items()))
-            self.assertEqual(sorted(expected_tests.items()), sorted(tests.items()))
+            self.assertEqual(sorted(expected_tests.items()), sorted(tests_results.items()))
             self.assertEqual(sorted(expected_metrics.items()), sorted(metrics.items()))
             self.assertEqual(test_logs, logs)
 
@@ -1645,10 +1651,11 @@ class TuxSuiteTest(TestCase):
             fake_request.get(urljoin(test_url + '/', 'tux_plan.yaml'), text='tux_plan.yaml contents')
 
             status, completed, metadata, tests, metrics, logs, attachments = self.tuxsuite.fetch(testjob)
+            tests_results = {k: v["result"] for k, v in tests.items()}
             self.assertEqual('Complete', status)
             self.assertTrue(completed)
             self.assertEqual(sorted(expected_metadata.items()), sorted(metadata.items()))
-            self.assertEqual(sorted(expected_tests.items()), sorted(tests.items()))
+            self.assertEqual(sorted(expected_tests.items()), sorted(tests_results.items()))
             self.assertEqual(sorted(expected_metrics.items()), sorted(metrics.items()))
             self.assertEqual(test_logs, logs)
 

squad-1.94.1/squad/version.py

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