trunk/buildfarm - Add support for delta generation against the packa...

[Ozan Çağlayan]

Author: ozan.caglayan
Date: Thu Mar 31 09:58:02 2011
New Revision: 36544

Added:
   trunk/buildfarm/buildfarm/releasecache.py
Modified:
   trunk/buildfarm/buildfarm/pisiinterface.py
   trunk/buildfarm/buildfarm/utils.py
   trunk/buildfarm/data/buildfarm.conf
Log:
Add support for delta generation against the package shipped within
BaseDeltaRelease configuration option e.g. 2011, 2011.1, etc.


---
 buildfarm/pisiinterface.py |    8 +++++
 buildfarm/releasecache.py  |   65 +++++++++++++++++++++++++++++++++++++++++++++
 buildfarm/utils.py         |    6 ++++
 data/buildfarm.conf        |    1 
 4 files changed, 80 insertions(+)

Modified: trunk/buildfarm/buildfarm/pisiinterface.py
=================================================================
--- trunk/buildfarm/buildfarm/pisiinterface.py	(original)
+++ trunk/buildfarm/buildfarm/pisiinterface.py	Thu Mar 31 09:58:02 2011
@@ -17,6 +17,7 @@
 import pisi.config
 
 from buildfarm import cli, logger, utils
+from buildfarm.releasecache import ReleaseCache
 from buildfarm.config import configuration as conf
 
 
@@ -79,6 +80,13 @@
             self.builder.search_old_packages_for_delta(max_count=3,
                                                        search_paths=(utils.get_stable_packages_directory(),))
 
+            # and 1 for the previous distribution release (e.g. 2011.1)
+            package_name = utils.get_package_name_from_path(pspec)
+            last_disto_release = ReleaseCache().get_last_release(package_name)
+            if last_distro_release:
+                self.builder.search_old_packages_for_delta(release=last_distro_release,
+                                                           search_paths=(utils.get_stable_packages_directory(),))
+
         self.builder.build()
 
         logger.info("Created package(s): %s" % self.builder.new_packages)

Modified: trunk/buildfarm/buildfarm/utils.py
=================================================================
--- trunk/buildfarm/buildfarm/utils.py	(original)
+++ trunk/buildfarm/buildfarm/utils.py	Thu Mar 31 09:58:02 2011
@@ -84,6 +84,12 @@
                         conf.release,
                         conf.subrepository)
 
+def get_remote_tags_repository_index_url():
+    return os.path.join(conf.scmrepositorybaseurl,
+                        "tags",
+                        conf.basedeltarelease,
+                        "pisi-index.xml.bz2")
+
 def get_package_log_directory():
     return os.path.join(conf.logdir,
                         conf.release,

Modified: trunk/buildfarm/data/buildfarm.conf
=================================================================
--- trunk/buildfarm/data/buildfarm.conf	(original)
+++ trunk/buildfarm/data/buildfarm.conf	Thu Mar 31 09:58:02 2011
@@ -7,6 +7,7 @@
 Release=
 SubRepository=devel
 Architecture=
+BaseDeltaRelease=
 
 [SCM]
 SCM=svn