squad 1.91__tar.gz → 1.92__tar.gz

{squad-1.91 → squad-1.92}/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.92
+
+This 1.92 release avoids an extra retry when fetching errored builds/tests in Tuxsuite.
+
 # 1.91
 
 This 1.91 release brings a few changes worth pointing out separately:

{squad-1.91/squad.egg-info → squad-1.92}/PKG-INFO

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

{squad-1.91 → squad-1.92}/squad/api/prometheus.py

@@ -43,7 +43,7 @@ def metrics(request):
 
         for queue in queues:
             if queue['name'] in available_queues:
-                metric_name = f'queue_{queue["name"]}_length'
+                metric_name = f'queue_{queue["name"]}_count'
                 length = queue['messages_ready']
 
                 output += f'\n# TYPE {metric_name} counter'

{squad-1.91 → squad-1.92}/squad/ci/backend/tuxsuite.py

@@ -249,9 +249,6 @@ class Backend(BaseBackend):
         test_job.name = test_name
 
         build_status = results['build_status']
-        if build_status == 'error' and results['retry'] < 2:
-            # SQUAD should retry fetching the build until retry == 2
-            raise TemporaryFetchIssue(results.get('status_message', 'TuxSuite Error'))
 
         # Make metadata
         metadata_keys = settings.get('BUILD_METADATA_KEYS', [])
@@ -270,7 +267,7 @@ class Backend(BaseBackend):
         metrics = {}
 
         completed = True
-        if results['retry'] >= 2:
+        if build_status == 'error':
             # This indicates that TuxSuite gave up trying to work on this build
             status = 'Incomplete'
             tests[f'build/{test_name}'] = 'skip'

{squad-1.91 → squad-1.92}/squad/plugins/linux_log_parser.py

@@ -6,21 +6,21 @@ from squad.plugins.lib.base_log_parser import BaseLogParser, REGEX_NAME, REGEX_E
 logger = logging.getLogger()
 
 MULTILINERS = [
-    ('exception', f'-+\[? cut here \]?-+.*?{tstamp}{pid}?\s+-+\[? end trace \w* \]?-+', f"\n{tstamp}{not_newline_or_plus}*"), # noqa
-    ('kasan', f'{tstamp}{pid}?\s+=+\n{tstamp}{pid}?\s+BUG: KASAN:.*?\n*?{tstamp}{pid}?\s+=+', f"BUG: KASAN:{not_newline_or_plus}*"), # noqa
-    ('kcsan', f'{tstamp}{pid}?\s+=+\n{tstamp}{pid}?\s+BUG: KCSAN:.*?=+', f"BUG: KCSAN:{not_newline_or_plus}*"), # noqa
-    ('kfence', f'{tstamp}{pid}?\s+=+\n{tstamp}{pid}?\s+BUG: KFENCE:.*?{tstamp}{pid}?\s+=+', f"BUG: KFENCE:{not_newline_or_plus}*"), # noqa
-    ('panic-multiline', f'{tstamp}{pid}?\s+Kernel panic - [^\n]+\n.*?-+\[? end Kernel panic - [^\n]+ \]?-*', f"Kernel {not_newline_or_plus}*"), # noqa
-    ('internal-error-oops', f'{tstamp}{pid}?\s+Internal error: Oops.*?-+\[? end trace \w+ \]?-+', f"Oops{not_newline_or_plus}*"), # noqa
+    ('exception', fr'-+\[? cut here \]?-+.*?{tstamp}{pid}?\s+-+\[? end trace \w* \]?-+', fr"\n{tstamp}{not_newline_or_plus}*"), # noqa
+    ('kasan', fr'{tstamp}{pid}?\s+=+\n{tstamp}{pid}?\s+BUG: KASAN:.*?\n*?{tstamp}{pid}?\s+=+', fr"BUG: KASAN:{not_newline_or_plus}*"), # noqa
+    ('kcsan', fr'{tstamp}{pid}?\s+=+\n{tstamp}{pid}?\s+BUG: KCSAN:.*?=+', fr"BUG: KCSAN:{not_newline_or_plus}*"), # noqa
+    ('kfence', fr'{tstamp}{pid}?\s+=+\n{tstamp}{pid}?\s+BUG: KFENCE:.*?{tstamp}{pid}?\s+=+', fr"BUG: KFENCE:{not_newline_or_plus}*"), # noqa
+    ('panic-multiline', fr'{tstamp}{pid}?\s+Kernel panic - [^\n]+\n.*?-+\[? end Kernel panic - [^\n]+ \]?-*', fr"Kernel {not_newline_or_plus}*"), # noqa
+    ('internal-error-oops', fr'{tstamp}{pid}?\s+Internal error: Oops.*?-+\[? end trace \w+ \]?-+', fr"Oops{not_newline_or_plus}*"), # noqa
 ]
 
 ONELINERS = [
-    ('oops', r'^[^\n]+Oops(?: -|:).*?$', f"Oops{not_newline_or_plus}*"), # noqa
-    ('fault', r'^[^\n]+Unhandled fault.*?$', f"Unhandled {not_newline_or_plus}*"), # noqa
-    ('warning', r'^[^\n]+WARNING:.*?$', f"WARNING:{not_newline_or_plus}*"), # noqa
-    ('bug', r'^[^\n]+(?: kernel BUG at|BUG:).*?$', f"BUG{not_newline_or_plus}*"), # noqa
-    ('invalid-opcode', r'^[^\n]+invalid opcode:.*?$', f"invalid opcode:{not_newline_or_plus}*"), # noqa
-    ('panic', r'Kernel panic - not syncing.*?$', f"Kernel {not_newline_or_plus}*"), # noqa
+    ('oops', r'^[^\n]+Oops(?: -|:).*?$', fr"Oops{not_newline_or_plus}*"), # noqa
+    ('fault', r'^[^\n]+Unhandled fault.*?$', fr"Unhandled {not_newline_or_plus}*"), # noqa
+    ('warning', r'^[^\n]+WARNING:.*?$', fr"WARNING:{not_newline_or_plus}*"), # noqa
+    ('bug', r'^[^\n]+(?: kernel BUG at|BUG:).*?$', fr"BUG{not_newline_or_plus}*"), # noqa
+    ('invalid-opcode', r'^[^\n]+invalid opcode:.*?$', fr"invalid opcode:{not_newline_or_plus}*"), # noqa
+    ('panic', r'Kernel panic - not syncing.*?$', fr"Kernel {not_newline_or_plus}*"), # noqa
 ]
 
 # Tip: broader regexes should come first

squad-1.92/squad/version.py

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

{squad-1.91 → squad-1.92/squad.egg-info}/PKG-INFO

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

{squad-1.91 → squad-1.92}/test/ci/backend/test_tuxsuite.py

@@ -652,44 +652,6 @@ class TuxSuiteTest(TestCase):
         self.assertEqual(build_results['build_name'], testjob.name)
         mock_fetch_from_results_input.assert_not_called()
 
-    @patch("squad.ci.backend.tuxsuite.Backend.fetch_from_results_input")
-    def test_retry_fetching_build_results(self, mock_fetch_from_results_input):
-        job_id = 'BUILD:tuxgroup@tuxproject#124'
-        testjob = self.build.test_jobs.create(target=self.project, backend=self.backend, job_id=job_id)
-        build_url = urljoin(TUXSUITE_URL, '/groups/tuxgroup/projects/tuxproject/builds/124')
-        build_download_url = 'http://builds.tuxbuild.com/124'
-
-        build_results = {
-            'retry': 0,  # this is the number of retry attempts TuxSuite has tried building
-            'state': 'finished',
-            'build_status': 'error',
-            'build_name': 'tux-build',
-            'git_repo': 'https://github.com/Linaro/linux-canaries.git',
-            'git_ref': 'v5.9',
-            'git_describe': 'v5.9',
-            'git_sha': 'bbf5c979011a099af5dc76498918ed7df445635b',
-            'git_short_log': 'bbf5c979011a ("Linux 5.9")',
-            'kernel_version': '5.9.0',
-            'kconfig': ['tinyconfig'],
-            'target_arch': 'x86_64',
-            'toolchain': 'gcc-10',
-            'download_url': build_download_url,
-            'provisioning_time': '2022-03-25T15:42:06.570362',
-            'running_time': '2022-03-25T15:44:16.223590',
-            'finished_time': '2022-03-25T15:46:56.095902',
-            'warnings_count': '2',
-            'status_message': 'Infrastructure Error, Please retry',
-        }
-
-        with requests_mock.Mocker() as fake_request:
-            fake_request.get(build_url, json=build_results)
-
-            with self.assertRaises(TemporaryFetchIssue):
-                self.tuxsuite.fetch(testjob)
-
-        self.assertEqual(build_results['build_name'], testjob.name)
-        mock_fetch_from_results_input.assert_not_called()
-
     def test_fetch_build_with_given_up_infra_error(self):
         "this will test that the backend will still fetch the build despite its errored state"
         job_id = 'BUILD:tuxgroup@tuxproject#125'
@@ -699,7 +661,7 @@ class TuxSuiteTest(TestCase):
 
         build_logs = ''
         build_results = {
-            'retry': 2,
+            'retry': 0,
             'state': 'finished',
             'build_status': 'error',
             'build_name': 'tux-build',

squad-1.91/squad/version.py

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