Merge lp:~shadowrobot/sr-build-tools/feature-releasejobs into lp:sr-build-tools

[markpitchless]

Add a add-release command to generate release jobs from a rosinstall file. e.g.

 bin/sr-jenkins-jobs -j jenkins:8080 add-release --prefix=test- --ros=electric data/shadow_robot-release.rosinstall

[markpitchless (markpitchless)]

http://reviewboard/r/99/

[Ugo (ugocupcic)]

Seems to be correct. Merging.

review: Approve

=== modified file 'bin/sr-jenkins-jobs'
--- bin/sr-jenkins-jobs	2012-06-01 15:37:25 +0000
+++ bin/sr-jenkins-jobs	2012-08-30 13:36:19 +0000
@@ -37,6 +37,7 @@
         self.schedule     = ""
         self.description  = ""
         self.command      = ""
+        self.publish_junit = False
         if color:
             # jenkins module returns 'disabled' as a color, otherwise the jobs
             # current status color. grey=new job, blue, red etc
@@ -53,26 +54,47 @@
 
     def as_xml(self):
         """Generate the XML for this job"""
+        var = self.__dict__
+        var['labels']   = escape(self.labels)
+        var['disabled'] = 'True' if self.disabled else 'False'
         xml = """
         <project>
           <actions/>
           <description>%(description)s</description>
           <keepDependencies>false</keepDependencies>
           <properties/>
-          <scm class="hudson.plugins.bazaar.BazaarSCM">
-            <source>%(bzr_source)s</source>
-            <clean>true</clean>
-            <checkout>false</checkout>
-          </scm>
+          """
+
+        if var['bzr_source']:
+            xml += """
+              <scm class="hudson.plugins.bazaar.BazaarSCM">
+                <source>%(bzr_source)s</source>
+                <clean>true</clean>
+                <checkout>false</checkout>
+              </scm>
+            """
+        else:
+            xml += """
+                <scm class="hudson.scm.NullSCM"/>
+            """
+
+        xml += """
           <assignedNode>%(labels)s</assignedNode>
           <canRoam>false</canRoam>
           <disabled>%(disabled)s</disabled>
           <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
           <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
           <triggers class="vector">
+        """
+
+        if var['schedule']:
+            xml += """
             <hudson.triggers.SCMTrigger>
               <spec>%(schedule)s</spec>
             </hudson.triggers.SCMTrigger>
+            """
+
+        xml += """
           </triggers>
           <concurrentBuild>false</concurrentBuild>
           <builders>
@@ -81,19 +103,23 @@
             </hudson.tasks.Shell>
           </builders>
           <publishers>
+        """
+
+        if var['publish_junit']:
+            xml += """
             <hudson.tasks.junit.JUnitResultArchiver>
               <testResults>test_results/_hudson/*.xml</testResults>
               <keepLongStdio>false</keepLongStdio>
               <testDataPublishers/>
             </hudson.tasks.junit.JUnitResultArchiver>
+            """
+
+        xml += """
             <org.jenkinsci.plugins.emotional__jenkins.EmotionalJenkinsPublisher/>
           </publishers>
           <buildWrappers/>
         </project>
         """
-        var = self.__dict__
-        var['labels']   = escape(self.labels)
-        var['disabled'] = 'True' if self.disabled else 'False'
         return xml % var
 
 class CmdError(Exception):
@@ -199,7 +225,7 @@
         grp.add_option('--distros', '--dist', action='append',
                 help='Distro(s) to create jobs for. Give multiple times for '
                 "multiple distros. e.g. 'ubuntu'.")
-        grp.add_option('--dist-releases', '--release', action='append',
+        grp.add_option('--dist-releases', '--release', '--rel', action='append',
                 help='Distro release(s) to create jobs for. Give multiple times for '
                      "multiple releases. e.g. 'lucid'")
         grp.add_option('--architectures', action='append',
@@ -212,6 +238,17 @@
                 help='ROS install file to use to create workspace for job to run in.'
                      ' Value is file name that must exist in sr-build-tools/data')
         optp.add_option_group(grp)
+        
+        grp = optparse.OptionGroup(optp, "Command: add-release OPTIONS FILE",
+                strip_indent(self.cmd_add_release.__doc__))
+        grp.add_option('--release-slave', default='slave-dev',
+                help='Name of slave used for release builds. Default=%default')
+        grp.add_option('--user-mirror', default='http://packages.shadow.local/ubuntu',
+                help='Url for the deb repo we are building for. Default=%default')
+        grp.add_option('--repo-upload',
+                default='[e-mail]:/srv/packages/ubuntu',
+                help="SSH login and path for uploading devs. slave is assumed to already have a key set that allows access. Default=%default")
+        optp.add_option_group(grp)
 
         self.opts, self.cmd_args = optp.parse_args()
 
@@ -252,6 +289,7 @@
             elif self.cmd in ['disable', 'off']:      return self.cmd_disable()
             elif self.cmd in ['build', 'run']:        return self.cmd_build()
             elif self.cmd in ['add-rosinstall']: return self.cmd_add_rosinstall()
+            elif self.cmd in ['add-release']:    return self.cmd_add_release()
             else:
                 self.log.error("Unknown command %s" % self.cmd)
                 optp.print_usage()
@@ -321,14 +359,7 @@
         for job in self._get_arg_jobs():
             self.build_job(job)
 
-    def cmd_add_rosinstall(self):
-        """
-        Generate jobs from a rosinstall file. For each stack listed add a job
-        per package, searching the bzr uri for the list of packages.
-        """
-        if len(self.cmd_args) < 1: raise CmdError("No rosinstall file")
-        f = self.cmd_args[0]
-
+    def load_yaml(self,f):
         data = None
         try:
             data = yaml.load(open(f))
@@ -338,6 +369,16 @@
             raise CmdError("Failed to parse %s : %s" % (f, e))
         except:
             raise
+        return data
+
+    def cmd_add_rosinstall(self):
+        """
+        Generate jobs from a rosinstall file. For each stack listed add a job
+        per package, searching the bzr uri for the list of packages.
+        """
+        if len(self.cmd_args) < 1: raise CmdError("No rosinstall file")
+        f = self.cmd_args[0]
+        data = self.load_yaml(f)
 
         # Use info to turn this into a set of add-packages calls
         if not self.opts.workspace_install:
@@ -353,6 +394,31 @@
                     )
         return 0
 
+    def cmd_add_release(self):
+        """Generate release jobs from a rosinstall file. Needs --ros-versions
+        option above."""
+        if len(self.cmd_args) < 1: raise CmdError("No rosinstall file")
+        f = self.cmd_args[0]
+        data = self.load_yaml(f)
+
+        if not self.opts.workspace_install:
+            self.opts.workspace_install = os.path.basename(f)
+
+        for inst in data:
+            if not 'bzr' in inst:
+                self.log.error("Can't handle non bzr source: %s " % inst.keys[0])
+                continue
+            for rosv in self.opts.ros_versions:
+                self.add_release_stack(
+                        stack = inst['bzr']['local-name'],
+                        rosv  = rosv,
+                        ws    = self.opts.workspace_install,
+                        user_mirror = self.opts.user_mirror,
+                        repo_upload = self.opts.repo_upload
+                        )
+        return 0
+
+
     def add_packages(self, stack=None, branch=None, packages=None):
         """Generates a set of shadow build jobs for the given options and
         package list. Will generate jobs for all the combinations of options.
@@ -434,6 +500,16 @@
         job.labels     = " && ".join((args['dist'], args['rel'], args['arch']))
         job.schedule   = self.opts.schedule
         job.command    = "/opt/shadow/sr-build-tools/bin/sr-jenkins-build %(rosv)s %(ws)s %(pkg)s" % args
+        job.publish_junit = True
+        self.add_job(job)
+
+    def add_release_stack(self, **args):
+        """Add a release job for the given config"""
+        job_name = "release-%(rosv)s-%(stack)s" % args
+        job = SrJenkinsJob(job_name)
+        job.labels     = self.opts.release_slave
+        job.command    = "/opt/shadow/sr-build-tools/bin/sr-jenkins-release %(rosv)s %(ws)s %(stack)s \"%(user_mirror)s\" \"%(repo_upload)s\"" % args
+        job.publish_junit = False
         self.add_job(job)
 
     def add_job(self, job):