Add regexp to recognize new error text.

No issue #

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>

diff --git a/jenkins/run_upload_packages.py b/jenkins/run_upload_packages.py
index ee3f8d21057ff99f87ea041b7cda717662210cba..fe01b92215cf542247974f584751b5d811542e42 100755 (executable)
--- a/jenkins/run_upload_packages.py
+++ b/jenkins/run_upload_packages.py
@@ -98,8 +98,12 @@ class PackageSuite:
 
 class PythonPackageSuite(PackageSuite):
     LOGGER_PART = 'python'
-    REUPLOAD_REGEXP = re.compile(
-        r'^error: Upload failed \(400\): A file named "[^"]+" already exists\b')
+    REUPLOAD_REGEXPS = [
+        re.compile(
+            r'^error: Upload failed \(400\): A file named "[^"]+" already exists\b'),
+        re.compile(
+            r'^error: Upload failed \(400\): File already exists\b'),
+    ]
 
     def __init__(self, glob_root, rel_globs):
         super().__init__(glob_root, rel_globs)
@@ -124,7 +128,7 @@ class PythonPackageSuite(PackageSuite):
             cmd.append('--quiet')
         cmd.extend(['sdist', '--dist-dir', '.upload_dist', 'upload'])
         upload_returncode, repushed = run_and_grep(
-            cmd, 'stderr', self.REUPLOAD_REGEXP, cwd=src_dir)
+            cmd, 'stderr', *self.REUPLOAD_REGEXPS, cwd=src_dir)
         if (upload_returncode != 0) and not repushed:
             raise subprocess.CalledProcessError(upload_returncode, cmd)
         shutil.rmtree(os.path.join(src_dir, '.upload_dist'))