yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TTM: Remove project-base option

Browse Source 
Derive project-base from project argument.
This removes some redundancy from cli.
This commit is contained in:
Dominik Heidler 2018-06-14 15:44:26 +02:00
parent 3b991374ae
commit 3cd27c8ded
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
totest-manager.py
View File

@ -920,11 +920,11 @@ class CommandlineInterface(cmdln.Cmdln):
} }
self.openqa_server = { self.openqa_server = {
'openSUSE': 'https://openqa.opensuse.org', 'openSUSE': 'https://openqa.opensuse.org',
'SLE': 'https://openqa.suse.de', 'SUSE': 'https://openqa.suse.de',
} }
self.api_url = { self.api_url = {
'openSUSE': 'https://api.opensuse.org', 'openSUSE': 'https://api.opensuse.org',
'SLE': 'https://api.suse.de', 'SUSE': 'https://api.suse.de',
} }
def get_optparser(self): def get_optparser(self):
@ -936,16 +936,12 @@ class CommandlineInterface(cmdln.Cmdln):
parser.add_option( parser.add_option(
"--osc-debug", action="store_true", help="osc debug output") "--osc-debug", action="store_true", help="osc debug output")
parser.add_option( parser.add_option(
"--project-base", help="""Select base of OBS/IBS project as well as openQA server based on distribution family, e.g. 'openSUSE' or 'SLE', default: "--openqa-server", help="""Full URL to the openQA server that should be queried, default based on project selection, e.g.
'openSUSE'""")
parser.add_option(
"--openqa-server", help="""Full URL to the openQA server that should be queried, default based on '--project-base' selection, e.g.
'https://openqa.opensuse.org' for 'openSUSE'""") 'https://openqa.opensuse.org' for 'openSUSE'""")
parser.add_option( parser.add_option(
"--obs-api-url", help="""Full URL to OBS instance to be queried, default based on '--project-base' selection, e.g. "--obs-api-url", help="""Full URL to OBS instance to be queried, default based on project selection, e.g.
'https://api.opensuse.org' for 'openSUSE'""") 'https://api.opensuse.org' for 'openSUSE'""")
return parser return parser
return parser
def postoptparse(self): def postoptparse(self):
level = None level = None
@ -963,17 +959,18 @@ class CommandlineInterface(cmdln.Cmdln):
osc.conf.get_config() osc.conf.get_config()
if (self.options.osc_debug): if (self.options.osc_debug):
osc.conf.config['debug'] = True osc.conf.config['debug'] = True
if not self.options.project_base:
self.options.project_base = 'openSUSE'
if not self.options.openqa_server:
self.options.openqa_server = self.openqa_server[self.options.project_base]
if not self.options.obs_api_url:
self.options.obs_api_url = self.api_url[self.options.project_base]
def _setup_totest(self, project): def _setup_totest(self, project):
fallback_project = 'openSUSE:%s' % project fallback_project = 'openSUSE:%s' % project
if project not in self.totest_class and fallback_project in self.totest_class: if project not in self.totest_class and fallback_project in self.totest_class:
project = fallback_project project = fallback_project
project_base = project.split(':')[0]
if not self.options.openqa_server:
self.options.openqa_server = self.openqa_server[project_base]
if not self.options.obs_api_url:
self.options.obs_api_url = self.api_url[project_base]
Config(project) Config(project)
if project not in self.totest_class: if project not in self.totest_class:
msg = 'Project %s not recognized. Possible values [%s]' % ( msg = 'Project %s not recognized. Possible values [%s]' % (