Merge lp:~matsubara/auto-package-testing/trigger-adt-test-support-ppa into lp:auto-package-testing

[Diogo Matsubara]

This branch adds support to monitor a list of PPAs for the auto package test header and trigger jenkins jobs for those. Also adds --release option to trigger-adt-test.

[Diogo Matsubara (matsubara)]

Btw, lines 53..54 are to fix a bug using -f option.

[Martin Pitt (pitti)]

Either this has already been merged before, or Jean-Baptiste implemented it independently. The current versions already have a --ppa switch.

review: Disapprove

[Diogo Matsubara (matsubara)]

Hi Martin, there's no --ppa option for the trigger-adt-test script and this branch adds it.

review: Resubmit

[Martin Pitt (pitti)]

Oh sorry, I misread.

[Diogo Matsubara (matsubara)]

I shouldn't have asked a review from myself.

review: Abstain

[lp:~matsubara/auto-package-testing/trigger-adt-test-support-ppa]

70. By Diogo Matsubara on 2012-10-26

merge from trunk

71. By Diogo Matsubara on 2012-10-26

another merge from trunk

[Diogo Matsubara (matsubara)]

Hi there, could you take another look? Is this good to merge?
Cheers,

Diogo

[Martin Pitt (pitti)]

I'd rather have Jean-Baptiste merge this. He's on vacation this week, so if anything blows up this week we'd have a problem. It looks good to me, but I wouldn't quite know how to roll it out anyway.

[Jean-Baptiste Lallement (jibel)]

Looks good. Thanks and sorry for the delay!

review: Approve

=== modified file 'jenkins/trigger-adt-test'
--- jenkins/trigger-adt-test	2012-10-26 15:29:00 +0000
+++ jenkins/trigger-adt-test	2012-10-26 17:24:21 +0000
@@ -44,6 +44,7 @@
 import jinja2
 import jenkins
 import argparse
+from softwareproperties.ppa import expand_ppa_line
 
 # 'all' is used to track the status across all archs.
 ARCHS = ('i386', 'amd64', 'all')
@@ -69,7 +70,7 @@
             is not reached
 
         '''
-        logging.debug("Instanciating new cache using rootdir '%s'", rootdir)
+        logging.debug("Instantiating new cache using rootdir '%s'", rootdir)
         super(AptCache, self).__init__(rootdir=rootdir, memonly=False)
         self.rootdir = rootdir
         self.timestampfile = os.path.normpath(
@@ -199,7 +200,7 @@
         return (version, pocket, depends)
 
     def run_required(self):
-        '''Return True is the job must run
+        '''Return True if the job must run
 
         Conditions are:
             - No version for the package (never ran before)
@@ -430,7 +431,7 @@
 
 
 def write_sources_list(path, release, arch, use_proposed=False,
-                       overwrite=False):
+                       overwrite=False, ppas=None):
     """ Write sources.list file
 
     :param path: Path to sources.list
@@ -438,6 +439,7 @@
     :param arch: architecture as returned by dpkg --print-architecture
     :param use_proposed: If True add an entry for proposed
     :param overwrite: Overwrite existing file if True
+    :param ppas: List of PPAs to add to sources.list
     """
 
     src = """\
@@ -451,9 +453,16 @@
 deb-src http://archive.ubuntu.com/ubuntu/ %s-proposed main restricted universe multiverse
 """ % (release, release)
 
+    if ppas:
+        for ppa in ppas:
+            (ppa_line, ignored) = expand_ppa_line(ppa, release)
+            ppa_src_line = 'deb-src' + ppa_line[3:]
+            src += "\n\n%s\n%s\n"% (ppa_line, ppa_src_line)
+
     if not os.path.exists(path) or overwrite:
         logging.debug('Writing sources.list to %s', path)
-        os.makedirs(os.path.dirname(path))
+        if not os.path.exists(path):
+            os.makedirs(os.path.dirname(path))
         with open(path, 'w') as f:
             f.write(src)
     else:
@@ -481,6 +490,10 @@
                         default=False,
                         help='Check if new versions are in -proposed and '
                         'enable -proposed in testbed.')
+    parser.add_argument('-p', '--ppa', action='append', metavar='PPA',
+                        default=None,
+                        help='Check if new versions are in PPA and ' \
+                        'enable the PPA in testbed.')
     parser.add_argument('-U', '--update-jobs', action='store_true',
                         default=False,
                         help='by default only new jobs are added. This '
@@ -510,7 +523,9 @@
     logging.debug('aptroot: %s', aptroot)
 
     sources_path = os.path.join(aptroot, 'etc/apt/sources.list')
-    write_sources_list(sources_path, release, arch, args.use_proposed)
+    write_sources_list(
+        sources_path, release, arch, args.use_proposed, args.force_update,
+        ppas=args.ppa)
 
     cache = AptCache(rootdir=aptroot, force_update=args.force_update)
     apt_pkg.Config.Set('Dir', aptroot)