From d58ae4e727558b9c5a2c8a46b90c54729ee08130 Mon Sep 17 00:00:00 2001 From: Ryan Tidwell Date: Wed, 5 Jun 2019 18:01:34 -0500 Subject: [PATCH] Fix build_test_package.py osc syntax As of osc version 0.164.2 the --all option must be supplied on deleterequest operations. This changes allow build_test_package.py to work on systems with newer versions of open build service commander. --- .../jenkins/ardana/gerrit/build_test_package.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/scripts/jenkins/ardana/gerrit/build_test_package.py b/scripts/jenkins/ardana/gerrit/build_test_package.py index b200fc2079..95492e03de 100755 --- a/scripts/jenkins/ardana/gerrit/build_test_package.py +++ b/scripts/jenkins/ardana/gerrit/build_test_package.py @@ -4,7 +4,6 @@ This file takes in a list of gerrit changes to build into the supplied OBS project. """ - import argparse import contextlib import glob @@ -16,6 +15,9 @@ import time import urllib +from distutils.version import StrictVersion +from io import StringIO + import sh try: @@ -194,11 +196,17 @@ def _create_test_project(self): meta.flush() print("Creating test project %s linked to project %s" % (self.obs_test_project_name, self.obs_linked_project)) + buf = StringIO() + sh.osc('--version', _out=buf) + osc_ver = buf.getvalue() sh.osc('-A', 'https://api.suse.de', 'api', '-T', meta.name, '/source/%s/_meta' % self.obs_test_project_name) - sh.osc('-A', 'https://api.suse.de', 'deleterequest', - self.obs_test_project_name, '--accept-in-hours', 720, - '-m', 'Auto delete after 30 days.') + args = ['-A', 'https://api.suse.de', 'deleterequest', + self.obs_test_project_name, '--accept-in-hours', 720, + '-m', 'Auto delete after 30 days.'] + if StrictVersion(osc_ver) > StrictVersion('0.164.1'): + args.append('--all') + sh.osc(*args) @find_in_osc_file('obs_scm filename') def _get_obsinfo_basename(self, service_def):