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

Merge pull request #1956 from Vogtinator/appliances

Browse Source 
Add option to release image_products into a separate repo
This commit is contained in:
Stephan Kulow 2019-04-17 09:30:34 +02:00 committed by GitHub
commit 39960a3e96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ttm/publisher.py
View File

@ -325,3 +325,8 @@ class ToTestPublisher(ToTestManager):
self.api.switch_flag_in_prj( self.api.switch_flag_in_prj(
self.project.test_project, flag='publish', state='enable', self.project.test_project, flag='publish', state='enable',
repository=self.project.product_repo) repository=self.project.product_repo)
if self.project.totest_images_repo != self.project.product_repo:
self.logger.info('Publish test project content (image_products)')
self.api.switch_flag_in_prj(self.project.test_project, flag='publish', state='enable',
repository=self.project.totest_images_repo)

8
ttm/releaser.py
View File

@ -220,7 +220,9 @@ class ToTestReleaser(ToTestManager):
for image in self.project.image_products: for image in self.project.image_products:
self.release_package(self.project.name, image.package, set_release=set_release, self.release_package(self.project.name, image.package, set_release=set_release,
repository=self.project.product_repo) repository=self.project.product_repo,
target_project=self.project.test_project,
target_repository=self.project.totest_images_repo)
def update_totest(self, snapshot=None): def update_totest(self, snapshot=None):
# omit snapshot, we don't want to rename on release # omit snapshot, we don't want to rename on release
@ -235,4 +237,8 @@ class ToTestReleaser(ToTestManager):
self.api.switch_flag_in_prj(self.project.test_project, flag='publish', state='disable', self.api.switch_flag_in_prj(self.project.test_project, flag='publish', state='disable',
repository=self.project.product_repo) repository=self.project.product_repo)
if self.project.totest_images_repo != self.project.product_repo:
self.api.switch_flag_in_prj(self.project.test_project, flag='publish', state='disable',
repository=self.project.totest_images_repo)
self._release(set_release=release) self._release(set_release=release)

6
ttm/totest.py
View File

@ -37,6 +37,8 @@ class ToTest(object):
self.product_arch = 'local' self.product_arch = 'local'
self.livecd_repo = 'images' self.livecd_repo = 'images'
self.totest_container_repo = 'containers' self.totest_container_repo = 'containers'
# Repo for image_products. If not set, uses product_repo.
self.totest_images_repo = None
self.main_products = [] self.main_products = []
self.ftp_products = [] self.ftp_products = []
@ -59,6 +61,10 @@ class ToTest(object):
else: else:
setattr(self, key, value) setattr(self, key, value)
# Set default for totest_images_repo
if self.totest_images_repo is None:
self.totest_images_repo = self.product_repo
def parse_images(self, products): def parse_images(self, products):
parsed = [] parsed = []
for package in products: for package in products: