diff --git a/gocd/totestmanager.gocd.yaml b/gocd/totestmanager.gocd.yaml index 020049e9..6cfa22fe 100644 --- a/gocd/totestmanager.gocd.yaml +++ b/gocd/totestmanager.gocd.yaml @@ -20,7 +20,7 @@ pipelines: tasks: - script: |- install -D /home/go/config/openqa-client.conf /home/go/.config/openqa/client.conf - scripts/totest-manager.py -A https://api.opensuse.org --osc-debug --debug run openSUSE:Factory + scripts/totest-manager.py -A https://api.opensuse.org --debug run openSUSE:Factory TTM.Factory_ARM: group: openSUSE.Checkers lock_behavior: unlockWhenFinished @@ -41,7 +41,7 @@ pipelines: tasks: - script: |- install -D /home/go/config/openqa-client.conf /home/go/.config/openqa/client.conf - scripts/totest-manager.py -A https://api.opensuse.org --osc-debug --debug run openSUSE:Factory:ARM + scripts/totest-manager.py -A https://api.opensuse.org --debug run openSUSE:Factory:ARM TTM.Factory_PowerPC: group: openSUSE.Checkers lock_behavior: unlockWhenFinished @@ -62,7 +62,7 @@ pipelines: tasks: - script: |- install -D /home/go/config/openqa-client.conf /home/go/.config/openqa/client.conf - scripts/totest-manager.py -A https://api.opensuse.org --osc-debug --debug run openSUSE:Factory:PowerPC + scripts/totest-manager.py -A https://api.opensuse.org --debug run openSUSE:Factory:PowerPC TTM.Factory_zSystems: group: openSUSE.Checkers lock_behavior: unlockWhenFinished @@ -83,7 +83,7 @@ pipelines: tasks: - script: |- install -D /home/go/config/openqa-client.conf /home/go/.config/openqa/client.conf - scripts/totest-manager.py -A https://api.opensuse.org --osc-debug --debug run openSUSE:Factory:zSystems + scripts/totest-manager.py -A https://api.opensuse.org --debug run openSUSE:Factory:zSystems TTM.Leap_15.0_Images: group: openSUSE.Checkers lock_behavior: unlockWhenFinished @@ -104,7 +104,7 @@ pipelines: tasks: - script: |- install -D /home/go/config/openqa-client.conf /home/go/.config/openqa/client.conf - scripts/totest-manager.py -A https://api.opensuse.org --osc-debug --debug run openSUSE:Leap:15.0:Images + scripts/totest-manager.py -A https://api.opensuse.org --debug run openSUSE:Leap:15.0:Images TTM.Leap_15.1_Images: group: openSUSE.Checkers lock_behavior: unlockWhenFinished @@ -125,7 +125,7 @@ pipelines: tasks: - script: |- install -D /home/go/config/openqa-client.conf /home/go/.config/openqa/client.conf - scripts/totest-manager.py -A https://api.opensuse.org --osc-debug --debug run openSUSE:Leap:15.1:Images + scripts/totest-manager.py -A https://api.opensuse.org --debug run openSUSE:Leap:15.1:Images TTM.Leap_15.1_ARM_Images: group: openSUSE.Checkers lock_behavior: unlockWhenFinished @@ -146,7 +146,7 @@ pipelines: tasks: - script: |- install -D /home/go/config/openqa-client.conf /home/go/.config/openqa/client.conf - scripts/totest-manager.py -A https://api.opensuse.org --osc-debug --debug run openSUSE:Leap:15.1:ARM:Images + scripts/totest-manager.py -A https://api.opensuse.org --debug run openSUSE:Leap:15.1:ARM:Images TTM.Leap_15.1: group: openSUSE.Checkers lock_behavior: unlockWhenFinished @@ -167,7 +167,7 @@ pipelines: tasks: - script: |- install -D /home/go/config/openqa-client.conf /home/go/.config/openqa/client.conf - scripts/totest-manager.py -A https://api.opensuse.org --osc-debug --debug run openSUSE:Leap:15.1 + scripts/totest-manager.py -A https://api.opensuse.org --debug run openSUSE:Leap:15.1 TTM.Leap_15.1_ARM: group: openSUSE.Checkers lock_behavior: unlockWhenFinished @@ -188,7 +188,7 @@ pipelines: tasks: - script: |- install -D /home/go/config/openqa-client.conf /home/go/.config/openqa/client.conf - scripts/totest-manager.py -A https://api.opensuse.org --osc-debug --debug run openSUSE:Leap:15.1:ARM + scripts/totest-manager.py -A https://api.opensuse.org --debug run openSUSE:Leap:15.1:ARM TTM.Leap_15.1_PowerPC: group: openSUSE.Checkers lock_behavior: unlockWhenFinished @@ -209,4 +209,4 @@ pipelines: tasks: - script: |- install -D /home/go/config/openqa-client.conf /home/go/.config/openqa/client.conf - scripts/totest-manager.py -A https://api.opensuse.org --osc-debug --debug run openSUSE:Leap:15.1:PowerPC + scripts/totest-manager.py -A https://api.opensuse.org --debug run openSUSE:Leap:15.1:PowerPC diff --git a/gocd/totestmanager.gocd.yaml.erb b/gocd/totestmanager.gocd.yaml.erb index 00b565bc..ee310070 100644 --- a/gocd/totestmanager.gocd.yaml.erb +++ b/gocd/totestmanager.gocd.yaml.erb @@ -23,5 +23,5 @@ pipelines: tasks: - script: |- install -D /home/go/config/openqa-client.conf /home/go/.config/openqa/client.conf - scripts/totest-manager.py -A https://api.opensuse.org --osc-debug --debug run <%= project %> + scripts/totest-manager.py -A https://api.opensuse.org --debug run <%= project %> <% end -%> diff --git a/ttm/manager.py b/ttm/manager.py index 3adb2a78..ace03a30 100644 --- a/ttm/manager.py +++ b/ttm/manager.py @@ -167,7 +167,7 @@ class ToTestManager(ToolBase.ToolBase): return version_file def write_version_to_dashboard(self, target, version): - if self.dryrun or self.norelease: + if self.dryrun or self.project.do_not_release: return self.api.pseudometa_file_ensure(self.version_file(target), version, comment='Update version') @@ -583,18 +583,23 @@ class ToTestManager(ToolBase.ToolBase): baseurl = ['source', project, package] url = self.api.makeurl(baseurl, query=query) - if self.dryrun or self.norelease: + if self.dryrun or self.project.do_not_release: self.logger.info('release %s/%s (%s)' % (project, package, query)) else: self.api.retried_POST(url) def _release(self, set_release=None): - # release 000product as a whole - if self.project.main_products[0].startswith('000product'): - self._release_package(self.project, '000product', set_release=set_release) + if len(self.project.main_products): + # release 000product as a whole + if self.project.main_products[0].startswith('000product'): + self._release_package(self.project, '000product', set_release=set_release) - for product in self.project.ftp_products: - self._release_package(self.project, product, repository=self.project.product_repo) + for cd in self.project.main_products: + self._release_package(self.project, cd, set_release=set_release, + repository=self.project.product_repo) + + for product in self.project.ftp_products: + self._release_package(self.project, product, repository=self.project.product_repo) for cd in self.project.livecd_products: self._release_package('%s:Live' % @@ -605,10 +610,6 @@ class ToTestManager(ToolBase.ToolBase): self._release_package(self.project, image.package, set_release=set_release, repository=self.project.product_repo) - for cd in self.project.main_products: - self._release_package(self.project, cd, set_release=set_release, - repository=self.project.product_repo) - for container in self.project.container_products: # Containers are built in the same repo as other image products, # but released into a different repo in :ToTest @@ -622,7 +623,7 @@ class ToTestManager(ToolBase.ToolBase): snapshot = None release = 'Snapshot%s' % snapshot if snapshot else None self.logger.info('Updating snapshot %s' % snapshot) - if not (self.dryrun or self.norelease): + if not (self.dryrun or self.project.do_not_release): self.api.switch_flag_in_prj(self.project.test_project, flag='publish', state='disable', repository=self.project.product_repo) @@ -630,7 +631,7 @@ class ToTestManager(ToolBase.ToolBase): def publish_factory_totest(self): self.logger.info('Publish test project content') - if not (self.dryrun or self.norelease): + if not (self.dryrun or self.project.do_not_release): self.api.switch_flag_in_prj( self.project.test_project, flag='publish', state='enable', repository=self.project.product_repo)