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

Merge pull request #1797 from dirkmueller/master

Browse Source 
[ARM] Further fixes for ttm on Factory
This commit is contained in:
Max Lin 2018-11-26 19:09:15 +08:00 committed by GitHub
commit 4331271baa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
osclib/conf.py
View File

@ -11,7 +11,7 @@ from osc import conf
from osclib.memoize import memoize
# Sane defatuls for openSUSE and SUSE. The string interpolation rule
# Sane defaults for openSUSE and SUSE. The string interpolation rule
# is as this:
#
# * %(project)s to replace the name of the project.
@ -50,6 +50,16 @@ DEFAULT = {
'mail-noreply': 'noreply@opensuse.org',
'mail-release-list': 'opensuse-releaseteam@opensuse.org',
},
r'openSUSE:(?P<project>Factory):ARM$': {
'product': 'openSUSE.product',
'openqa': 'https://openqa.opensuse.org',
'main-repo': 'standard',
'pseudometa_package': 'openSUSE:%(project)s:ARM:Staging/dashboard',
'download-baseurl': 'http://download.opensuse.org/ports/aarch64/tumbleweed/',
'mail-list': 'opensuse-arm@opensuse.org',
'mail-maintainer': 'Dirk Mueller <dmueller@suse.com>',
'mail-noreply': 'noreply@opensuse.org',
},
r'openSUSE:(?P<project>Leap:(?P<version>[\d.]+))(?::NonFree)?$': {
'staging': 'openSUSE:%(project)s:Staging',
'staging-group': 'factory-staging',
@ -99,6 +109,16 @@ DEFAULT = {
'mail-noreply': 'noreply@opensuse.org',
'mail-release-list': 'opensuse-releaseteam@opensuse.org',
},
r'openSUSE:(?P<project>Leap:(?P<version>[\d.]+)):ARM$': {
'product': 'openSUSE.product',
'openqa': 'https://openqa.opensuse.org',
'main-repo': 'ports',
'pseudometa_package': 'openSUSE:%(project)s:ARM:Staging/dashboard',
'download-baseurl': 'http://download.opensuse.org/ports/aarch64/distribution/leap/%(version)s/',
'mail-list': 'opensuse-arm@opensuse.org',
'mail-maintainer': 'Dirk Mueller <dmueller@suse.com>',
'mail-noreply': 'noreply@opensuse.org',
},
r'openSUSE:(?P<project>Leap:(?P<version>[\d.]+)(?::NonFree)?:Update)$': {
'main-repo': 'standard',
'leaper-override-group': 'leap-reviewers',

5
osclib/core.py
View File

@ -278,7 +278,10 @@ def project_pseudometa_package(apiurl, project):
def project_pseudometa_file_load(apiurl, project, filename, revision=None):
project, package = project_pseudometa_package(apiurl, project)
return source_file_load(apiurl, project, package, filename, revision)
source_file = source_file_load(apiurl, project, package, filename, revision)
if source_file is not None:
source_file = source_file.rstrip()
return source_file
def project_pseudometa_file_save(apiurl, project, filename, content, comment=None):
project, package = project_pseudometa_package(apiurl, project)

6
tests/config_tests.py
View File

@ -49,8 +49,10 @@ class TestConfig(unittest.TestCase):
# A list of projects that should match each of the DEFAULT patterns.
projects = (
'openSUSE:Factory',
'openSUSE:Leap:15.0',
'openSUSE:Leap:15.0:Update',
'openSUSE:Factory:ARM',
'openSUSE:Leap:15.1',
'openSUSE:Leap:15.1:ARM',
'openSUSE:Leap:15.1:Update',
'openSUSE:Backports:SLE-15',
'openSUSE:Backports:SLE-15:Update',
'SUSE:SLE-15:GA',

3
totest-manager.py
View File

@ -838,6 +838,9 @@ class ToTestFactoryARM(ToTestFactory):
livecd_products = [ImageProduct('JeOS', ['armv7l'])]
# JeOS doesn't follow build numbers of main isos
need_same_build_number = False
def __init__(self, *args, **kwargs):
ToTestFactory.__init__(self, *args, **kwargs)