Merge pull request #3161 from nilxam/ttm_16_0

ttm: support Leap 16.0 development structure
openSUSE · Sep 13, 2024 · f823b3d · f823b3d
2 parents 637be99 + 0f8f017
commit f823b3d
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 3 deletions.
diff --git a/gocd/totestmanager.gocd.yaml b/gocd/totestmanager.gocd.yaml
@@ -252,6 +252,27 @@ pipelines:
         - script: |-
             install -D /home/go/config/openqa-client.conf /home/go/.config/openqa/client.conf
             scripts/totest-manager.py -A https://api.opensuse.org --debug run openSUSE:Leap:15.6:ARM:Images
+  TTM.Leap_16.0:
+    group: openSUSE.Checkers
+    lock_behavior: unlockWhenFinished
+    environment_variables:
+      OSC_CONFIG: /home/go/config/oscrc-totest-manager
+    materials:
+      script:
+        git: https://github.com/openSUSE/openSUSE-release-tools.git
+        destination: scripts
+    timer:
+      spec: 0 */15 * ? * *
+      only_on_changes: false
+    stages:
+    - Run:
+        approval: manual
+        resources:
+        - staging-bot
+        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 --debug run openSUSE:Leap:16.0
   TTM.Leap_Micro_6.0:
     group: openSUSE.Checkers
     lock_behavior: unlockWhenFinished

diff --git a/gocd/totestmanager.gocd.yaml.erb b/gocd/totestmanager.gocd.yaml.erb
@@ -13,6 +13,7 @@ pipelines:
       openSUSE:Leap:15.6:Images
       openSUSE:Leap:15.6:ARM
       openSUSE:Leap:15.6:ARM:Images
+      openSUSE:Leap:16.0
       openSUSE:Leap:Micro:6.0
       openSUSE:Leap:Micro:6.0:Images
   ) -%>

diff --git a/ttm/manager.py b/ttm/manager.py
@@ -72,6 +72,14 @@ def iso_build_version(self, project, tree, repo=None, arch=None):
                 return result.group(1)
         raise NotFoundException(f"can't find {project} iso version")
 
+    def productcompose_build_version(self, project, tree, repo=None, arch=None):
+        for binary in self.binaries_of_product(project, tree, repo=repo, arch=arch):
+            result = re.match(
+                r'.*-(?:Build|Snapshot)([0-9.]+)(.report)', binary)
+            if result:
+                return result.group(1)
+        raise NotFoundException(f"can't find {project} productcompose version")
+
     def version_from_totest_project(self):
         if len(self.project.main_products):
             return self.iso_build_version(self.project.test_project, self.project.main_products[0])

diff --git a/ttm/releaser.py b/ttm/releaser.py
@@ -76,6 +76,11 @@ def version_from_project(self):
             return self.release_version()
 
         if len(self.project.main_products):
+            # 000productcompose has ftp built only and the build number
+            # agama-installer carry over build number from 000prodcutcompose
+            # but they are not from the same package container
+            if 'productcompose' in self.project.main_products[0]:
+                return self.productcompose_build_version(self.project.name, self.project.main_products[0])
             return self.iso_build_version(self.project.name, self.project.main_products[0])
 
         return self.iso_build_version(self.project.name, self.project.image_products[0].package,
@@ -286,17 +291,24 @@ def _release(self, set_release=None):
                 self.release_package(self.project.name, product, repository=self.project.product_repo)
 
             for cd in self.project.main_products:
-                self.release_package(self.project.name, cd, set_release=set_release,
-                                     repository=self.project.product_repo)
+                # do not set release number if it is productcompose
+                if 'productcompose' in self.project.main_products[0]:
+                    self.release_package(self.project.name, cd, repository=self.project.product_repo)
+                else:
+                    self.release_package(self.project.name, cd, set_release=set_release,
+                                         repository=self.project.product_repo)
 
         for cd in self.project.livecd_products:
             self.release_package('%s:Live' %
                                  self.project.name, cd.package, set_release=set_release,
                                  repository=self.project.livecd_repo)
 
         for image in self.project.image_products:
+            source_repo = self.project.product_repo
+            if self.project.same_target_images_repo_for_source_repo:
+                source_repo = self.project.totest_images_repo
             self.release_package(self.project.name, image.package, set_release=set_release,
-                                 repository=self.project.product_repo,
+                                 repository=source_repo,
                                  target_project=self.project.test_project,
                                  target_repository=self.project.totest_images_repo)
 

diff --git a/ttm/totest.py b/ttm/totest.py
@@ -31,6 +31,7 @@ def __init__(self, project, apiurl):
         self.set_snapshot_number = False
         self.snapshot_number_prefix = "Snapshot"
         self.take_source_from_product = False
+        self.same_target_images_repo_for_source_repo = False
         self.arch = 'x86_64'
         self.openqa_server = None