Merge pull request #264 from openSUSE/coolo_tumblweed_iso
we can't use the project name for the iso prefix in factory
This commit is contained in:
commit
bbeb27de10
@ -42,6 +42,9 @@ class ToTestBase(object):
|
|||||||
def openqa_version(self):
|
def openqa_version(self):
|
||||||
return self.project
|
return self.project
|
||||||
|
|
||||||
|
def iso_prefix(self):
|
||||||
|
return self.project
|
||||||
|
|
||||||
def binaries_of_product(self, project, product):
|
def binaries_of_product(self, project, product):
|
||||||
url = self.api.makeurl(['build', project, 'images', 'local', product])
|
url = self.api.makeurl(['build', project, 'images', 'local', product])
|
||||||
try:
|
try:
|
||||||
@ -61,7 +64,7 @@ class ToTestBase(object):
|
|||||||
|
|
||||||
# for now we hardcode all kind of things
|
# for now we hardcode all kind of things
|
||||||
for binary in self.binaries_of_product('openSUSE:%s:ToTest' % self.project, '_product:openSUSE-cd-mini-i586'):
|
for binary in self.binaries_of_product('openSUSE:%s:ToTest' % self.project, '_product:openSUSE-cd-mini-i586'):
|
||||||
result = re.match(r'openSUSE-%s-NET-i586-Snapshot(.*)-Media.iso' % self.project,
|
result = re.match(r'openSUSE-%s-NET-i586-Snapshot(.*)-Media.iso' % self.iso_prefix(),
|
||||||
binary)
|
binary)
|
||||||
if result:
|
if result:
|
||||||
return result.group(1)
|
return result.group(1)
|
||||||
@ -367,6 +370,9 @@ class ToTestFactory(ToTestBase):
|
|||||||
def openqa_version(self):
|
def openqa_version(self):
|
||||||
return 'FTT'
|
return 'FTT'
|
||||||
|
|
||||||
|
def iso_prefix(self):
|
||||||
|
return 'Tumbleweed'
|
||||||
|
|
||||||
# for Factory we check the version of the release package
|
# for Factory we check the version of the release package
|
||||||
def current_version(self):
|
def current_version(self):
|
||||||
url = self.api.makeurl(['build', 'openSUSE:%s' % self.project, 'standard', 'x86_64',
|
url = self.api.makeurl(['build', 'openSUSE:%s' % self.project, 'standard', 'x86_64',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user