diff --git a/ttm/publisher.py b/ttm/publisher.py index a2eaeb84..f00f17d9 100644 --- a/ttm/publisher.py +++ b/ttm/publisher.py @@ -325,3 +325,8 @@ class ToTestPublisher(ToTestManager): self.api.switch_flag_in_prj( self.project.test_project, flag='publish', state='enable', 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) diff --git a/ttm/releaser.py b/ttm/releaser.py index 343ffa73..32c2a91b 100644 --- a/ttm/releaser.py +++ b/ttm/releaser.py @@ -220,7 +220,9 @@ class ToTestReleaser(ToTestManager): for image in self.project.image_products: 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): # 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', 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) diff --git a/ttm/totest.py b/ttm/totest.py index cb9503ac..f17f2f83 100755 --- a/ttm/totest.py +++ b/ttm/totest.py @@ -37,6 +37,8 @@ class ToTest(object): self.product_arch = 'local' self.livecd_repo = 'images' self.totest_container_repo = 'containers' + # Repo for image_products. If not set, uses product_repo. + self.totest_images_repo = None self.main_products = [] self.ftp_products = [] @@ -59,6 +61,10 @@ class ToTest(object): else: 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): parsed = [] for package in products: