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

Calculate is_image_product instead of configuring it

Browse Source
This commit is contained in:
Stephan Kulow 2019-03-26 11:25:38 +01:00
parent 86c507d668
commit b35453b4bf
5 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ttm/config/openSUSE:Leap:15.0:Images.yaml
View File

@ -1,4 +1,3 @@
is_image_product: true
jobs_num: 13 jobs_num: 13
openqa_group: openSUSE Leap 15.0 Images openqa_group: openSUSE Leap 15.0 Images
openqa_server: https://openqa.opensuse.org openqa_server: https://openqa.opensuse.org

1
ttm/config/openSUSE:Leap:15.1:ARM:Images.yaml
View File

@ -1,4 +1,3 @@
is_image_product: true
jobs_num: 2 jobs_num: 2
openqa_group: openSUSE Leap 15.1 AArch64 Images openqa_group: openSUSE Leap 15.1 AArch64 Images
openqa_server: https://openqa.opensuse.org openqa_server: https://openqa.opensuse.org

1
ttm/config/openSUSE:Leap:15.1:Images.yaml
View File

@ -1,4 +1,3 @@
is_image_product: true
jobs_num: 13 jobs_num: 13
openqa_group: openSUSE Leap 15.1 Images openqa_group: openSUSE Leap 15.1 Images
openqa_server: https://openqa.opensuse.org openqa_server: https://openqa.opensuse.org

4
ttm/manager.py
View File

@ -200,9 +200,9 @@ class ToTestManager(ToolBase.ToolBase):
if self.project.take_source_from_product: if self.project.take_source_from_product:
if self.project.is_image_product: if self.project.is_image_product:
return self.iso_build_version(self.project, self.project.image_products[0].package, return self.iso_build_version(self.project.name, self.project.image_products[0].package,
arch=self.project.image_products[0].archs[0]) arch=self.project.image_products[0].archs[0])
return self.iso_build_version(self.project, self.project.main_products[0]) return self.iso_build_version(self.project.name, self.project.main_products[0])
else: else:
return self.release_version() return self.release_version()

12
ttm/totest.py
View File

@ -28,7 +28,6 @@ class ToTest(object):
self.do_not_release = False self.do_not_release = False
self.need_same_build_number = False self.need_same_build_number = False
self.set_snapshot_number = False self.set_snapshot_number = False
self.is_image_product = False
self.take_source_from_product = False self.take_source_from_product = False
self.arch = 'x86_64' self.arch = 'x86_64'
self.openqa_server = None self.openqa_server = None
@ -50,6 +49,7 @@ class ToTest(object):
self.jobs_num = 42 self.jobs_num = 42
self.load_config() self.load_config()
self.test_project = '%s:%s' % (project, self.test_subproject) self.test_project = '%s:%s' % (project, self.test_subproject)
self.is_image_product = not len(self.main_products)
def load_config(self): def load_config(self):
config = yaml.load(open('ttm/config/{}.yaml'.format(self.name))) config = yaml.load(open('ttm/config/{}.yaml'.format(self.name)))
@ -70,10 +70,10 @@ class ToTest(object):
def set_products(self, products): def set_products(self, products):
# plain arrays # plain arrays
setattr(self, 'main_products', products['main']) setattr(self, 'main_products', products.get('main', []))
setattr(self, 'ftp_products', products['ftp']) setattr(self, 'ftp_products', products.get('ftp', []))
# image products # image products
setattr(self, 'livecd_products', self.parse_images(products['livecds'])) setattr(self, 'livecd_products', self.parse_images(products.get('livecds', [])))
setattr(self, 'image_products', self.parse_images(products['images'])) setattr(self, 'image_products', self.parse_images(products.get('images', [])))
setattr(self, 'container_products', self.parse_images(products['container'])) setattr(self, 'container_products', self.parse_images(products.get('container', [])))