Merge lp:~sil2100/cupstream2distro/rebuild_in_ppa into lp:cupstream2distro

[Robert Bruce Park]

(sorry for proposing your branch, was just curious to see a diff!)

[Robert Bruce Park (robru)]

I like where you're going with this PPARebuild class, but I wonder if it should be moved into a new jenkins job rather than having Yet Another Checkbox on the build job? Especially considering that checking that box makes so many other boxes ignored, it seems weird to have one checkbox that can invalidate other checkboxes from a usability perspective.

If we started a new jenkins job for this, the benefit would be that there'd be no options at all except for the package name selector, which would be delightfully simple.

What do you think?

Unmerged revisions

963. By Łukasz Zemczak on 2015-07-23

Help string for the new option

962. By Łukasz Zemczak on 2015-07-23

Merge trunk

961. By Łukasz Zemczak on 2015-07-23

Initial version of the PPARebuild scenario, where landers can request rebuilds of packages in the PPA without re-uploading. No tests, ugly case-handling.

=== modified file 'citrain/build.py'
--- citrain/build.py	2015-08-06 17:39:28 +0000
+++ citrain/build.py	2015-08-06 23:17:46 +0000
@@ -43,6 +43,10 @@
     Only useful for sync requests. Instead of rebuilding sources for
     the destination archive, copy binary packages.
 
+REBUILD_IN_PPA
+    Do not build anything, just take the selected PACKAGES_TO_REBUILD and
+    rebuild them in the PPA if possible, without reuploading
+
 DEBUG
     Enable debug infos
 """
@@ -631,6 +635,25 @@
         super(Manual, self).diff_phase()
 
 
+class PPARebuild(Manual):
+    """Perform a PPA rebuild of all latest failed builds for the package."""
+
+    def upload_phase(self):
+        """Scan for the recent version builds and retry them"""
+        latest_version = self.get_archive_version(self.silo_ppa)
+        builds = self.silo_ppa.getBuildRecords(source_name=self.name)
+        latest_failed_archs = set()
+        for b in builds:
+            build_version = b.current_source_publication.source_package_version
+            # Only consider rebuilding every arch once
+            if (build_version == latest_version and b.can_be_retried and
+                    b.arch_tag not in latest_failed_archs):
+                latest_failed_archs.add(b.arch_tag)
+                logging.info('Retrying {} build of {} {} in the PPA.'.format(
+                    b.arch_tag, self.name, latest_version))
+                b.retry()
+
+
 class BinarySync(Manual):
     """Copy package binaries from one PPA to another, no rebuilding.
 
@@ -728,6 +751,16 @@
         self.names = set(env.PACKAGES_TO_REBUILD.split()
                          or self.silo_state.all_projects)
         include_all = 'true' in (env.FORCE_REBUILD, env.WATCH_ONLY)
+        if env.REBUILD_IN_PPA:
+            if not env.PACKAGES_TO_REBUILD:
+                self.do = lambda *ignore: None
+                raise BuildError(
+                    'You need to explicitly list package names when '
+                    'requesting REBUILD_IN_PPA.')
+            if include_all:
+                logging.warning(
+                    'WATCH_ONLY and FORCE_REBUILD flags are ignored '
+                    'during REBUILD_IN_PPA.')
         if not (include_all or env.PACKAGES_TO_REBUILD):
             # Don't rebuild existing builds without forcing.
             previous = self.names & set(find_all_uploaded())
@@ -746,18 +779,25 @@
 
     def choose_classes(self):
         """Decide which class to use for each individual package build."""
-        include_binaries = env.INCLUDE_BINARIES_IN_SYNC == 'true'
-        Sync = BinarySync if include_binaries else SourceSync
-        Source = Sync if self.silo_state.source_archive else Manual
-        self.types = {
-            Merge: self.names & set(self.silo_state.mps),
-            Source: self.names & set(self.silo_state.sources),
-        }
-        if self.silo_state.source_archive:
-            Sync.from_archive = lp.load(self.silo_state.source_archive)
-            Sync.from_series = lp.get_series(
-                self.silo_state.source_series, dest=Sync.from_archive)
-        Merge.all_mps = self.silo_state.mps
+        if env.REBUILD_IN_PPA:
+            Source = PPARebuild
+            self.types = {
+                Merge: set()
+                Source: self.names
+            }
+        else:
+            include_binaries = env.INCLUDE_BINARIES_IN_SYNC == 'true'
+            Sync = BinarySync if include_binaries else SourceSync
+            Source = Sync if self.silo_state.source_archive else Manual
+            self.types = {
+                Merge: self.names & set(self.silo_state.mps),
+                Source: self.names & set(self.silo_state.sources),
+            }
+            if self.silo_state.source_archive:
+                Sync.from_archive = lp.load(self.silo_state.source_archive)
+                Sync.from_series = lp.get_series(
+                    self.silo_state.source_series, dest=Sync.from_archive)
+            Merge.all_mps = self.silo_state.mps
 
     def instantiate_build_objects(self):
         """Instantiate the chosen classes for each chosen package."""