#!/usr/bin/env python3
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
import argparse
import functools
import glob
import sys
import time
-def run_and_scan_output(cmd, read_output, *line_matchers,
- encoding=locale.getpreferredencoding(), **popen_kwargs):
+def run_and_grep(cmd, read_output, *regexps,
+ encoding=locale.getpreferredencoding(), **popen_kwargs):
"""Run a subprocess and capture output lines matching regexps.
Arguments:
Returns 2-tuple (subprocess returncode, list of matched output lines).
"""
- line_matchers = [matcher if hasattr(matcher, 'search') else re.compile(matcher)
- for matcher in line_matchers]
+ regexps = [regexp if hasattr(regexp, 'search') else re.compile(regexp)
+ for regexp in regexps]
popen_kwargs[read_output] = subprocess.PIPE
proc = subprocess.Popen(cmd, **popen_kwargs)
with open(getattr(proc, read_output).fileno(), encoding=encoding) as output:
- matched_lines = [line for line in output
- if any(regexp.search(line) for regexp in line_matchers)]
+ matched_lines = []
+ for line in output:
+ if any(regexp.search(line) for regexp in regexps):
+ matched_lines.append(line)
+ if read_output == 'stderr':
+ print(line, file=sys.stderr, end='')
return proc.wait(), matched_lines
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'),
+ re.compile(
+ r'^error: Upload failed \(400\): Only one sdist may be uploaded per release\b'),
+ ]
def __init__(self, glob_root, rel_globs):
super().__init__(glob_root, rel_globs)
if not self.logger.isEnabledFor(logging.INFO):
cmd.append('--quiet')
cmd.extend(['sdist', '--dist-dir', '.upload_dist', 'upload'])
- upload_returncode, repushed = run_and_scan_output(
- cmd, 'stderr', self.REUPLOAD_REGEXP, cwd=src_dir)
+ upload_returncode, repushed = run_and_grep(
+ 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'))
def upload_file(self, path):
cmd = ['gem', 'push', path]
- push_returncode, repushed = run_and_scan_output(
- cmd, 'stdout', self.REUPLOAD_REGEXP)
+ push_returncode, repushed = run_and_grep(cmd, 'stdout', self.REUPLOAD_REGEXP)
if (push_returncode != 0) and not repushed:
raise subprocess.CalledProcessError(push_returncode, cmd)
rm "$@"
"""
TARGET_DISTNAMES = {
- 'debian7': 'wheezy',
'debian8': 'jessie',
+ 'debian9': 'stretch',
'ubuntu1204': 'precise',
'ubuntu1404': 'trusty',
+ 'ubuntu1604': 'xenial',
}
def post_uploads(self, paths):
"""
REPO_ROOT = '/var/www/rpm.arvados.org/'
TARGET_REPODIRS = {
- 'centos6': 'CentOS/6/os/x86_64/',
'centos7': 'CentOS/7/os/x86_64/',
}
'services/login-sync/*.gem',
),
}
-for target in ['debian7', 'debian8', 'ubuntu1204', 'ubuntu1404']:
+for target in ['debian8', 'debian9', 'ubuntu1204', 'ubuntu1404', 'ubuntu1604']:
PACKAGE_SUITES[target] = _define_suite(
DebianPackageSuite, os.path.join('packages', target, '*.deb'),
target=target)
-for target in ['centos6', 'centos7']:
+for target in ['centos7']:
PACKAGE_SUITES[target] = _define_suite(
RedHatPackageSuite, os.path.join('packages', target, '*.rpm'),
target=target)