Fix regex according to current error messages, but allow old form too

iib/workers/tasks/utils.py

@@ -716,6 +716,8 @@ def _regex_reverse_search(
     :return: the regex match or None if not matched
     :rtype: re.Match
     """
+    print(f"regex: {regex}")
+    print(f"proc_response: {proc_response.stderr.splitlines()}")
     # Start from the last log message since the failure occurs near the bottom
     for msg in reversed(proc_response.stderr.splitlines()):
         match = re.match(regex, msg)
@@ -766,10 +768,16 @@ def run_cmd(
                 raise IIBError(f'{exc_msg.rstrip(".")}: {match.groups()[0]}')
         elif cmd[0] == 'buildah':
             # Check for HTTP 50X errors on buildah
-            regex = r'.*(error creating build container).*((?:50[0-9]|125)\s.*$)'
-            match = _regex_reverse_search(regex, response)
-            if match:
-                raise ExternalServiceError(f'{exc_msg}: {": ".join(match.groups()).strip()}')
+            network_regexes = [
+                r'.*([e,E]rror:? creating build container).*(:?(50[0-9]|125)\s.*$)',
+                r'.* read\/write on closed pipe.*',
+            ]
+            for regex in network_regexes:
+                match = _regex_reverse_search(regex, response)
+                if match:
+                    print(match.groups())
+                if match:
+                    raise ExternalServiceError(f'{exc_msg}: {": ".join(match.groups()).strip()}')
 
         raise IIBError(exc_msg)
 

tests/test_workers/test_tasks/test_utils.py

@@ -270,35 +270,26 @@ def test_run_cmd_failed_opm(mock_sub_run):
 
     mock_sub_run.assert_called_once()
 
-
+@pytest.mark.parametrize(
+    'expected_exc, expected_stderr',
+    [
+        (
+            r'Failed build the index image: error creating build container: 503 \(Service Unavailable\)',
+            'error creating build container: reading blob sha256:322292: Error fetching blob: invalid status code from registry 503 (Service Unavailable)',
+        ),
+        (
+            r'Failed build the index image: read/write on closed pipe',
+            'Error: committing container for ..... step storing layer to file: io: read/write on closed pipe',
+        )
+    ]
+)
 @mock.patch('iib.workers.tasks.utils.subprocess.run')
-def test_run_cmd_failed_buildah(mock_sub_run):
+def test_run_cmd_failed_buildah(mock_sub_run, expected_stderr, expected_exc):
     mock_rv = mock.Mock()
     mock_rv.returncode = 1
-    mock_rv.stderr = textwrap.dedent(
-        '''
-        2021-12-14 08:52:39,144 iib.workers.tasks.utils DEBUG utils.run_cmd Running the command "buildah bud --no-cache --override-arch s390x --arch s390x -t iib-build:56056-s390x -f /tmp/iib-ozo81z6o/index.Dockerfile"
-        2021-12-14 08:55:10,212 iib.workers.tasks.utils ERROR utils.run_cmd The command "buildah bud --no-cache --override-arch s390x --arch s390x -t iib-build:56056-s390x -f /tmp/iib-ozo81z6o/index.Dockerfile" failed with: Trying to pull registry.redhat.io/openshift4/ose-operator-registry@sha256:72498731bbea4307178f9d0d237bf2a8439bfa8f580f87c35e5a73cb1c854bd6...
-        Getting image source signatures
-        Checking if image destination supports signatures
-        Copying blob sha256:b381d16488eb8afbbaed78ff48e8b4702b04c236400524dfd2ae759127422edf
-        Copying blob sha256:27cb39a08c6eb46426e92622c4edea9b9b8495b2401d02c773e239dd40d99a22
-        Copying blob sha256:3eabe22a2aec9181c0849b1a23a6104a81bcf00bea55a52a45dba613f0afd896
-        Copying blob sha256:3224b0f72681ebcfaec3c51b3d7efe187a5cab0355b4bbe6cffadde0d17d2292
-        Copying blob sha256:45ac5acd44f7a277e412330b36e908278d979fa0de30ca0628ef0729f61d825e
-        Copying blob sha256:45ac5acd44f7a277e412330b36e908278d979fa0de30ca0628ef0729f61d825e
-        Copying blob sha256:3eabe22a2aec9181c0849b1a23a6104a81bcf00bea55a52a45dba613f0afd896
-        Copying blob sha256:27cb39a08c6eb46426e92622c4edea9b9b8495b2401d02c773e239dd40d99a22
-        error creating build container: reading blob sha256:3224b0f72681ebcfaec3c51b3d7efe187a5cab0355b4bbe6cffadde0d17d2292: Error fetching blob: invalid status code from registry 503 (Service Unavailable)
-        time="2021-12-14T08:55:10-05:00" level=error msg="exit status 125"
-        '''  # noqa: E501
-    )
+    mock_rv.stderr = expected_stderr
     mock_sub_run.return_value = mock_rv
 
-    expected_exc = (
-        r'Failed build the index image: error creating build container: 503 \(Service Unavailable\)'
-    )
-
     with pytest.raises(ExternalServiceError, match=expected_exc):
         utils.run_cmd(
             [