Merge lp:~pfalcon/linaro-ci-dashboard/bzr_home into lp:linaro-ci-dashboard

[Paul Sokolovsky]

This is fixed for issues when checking out bzr branches in local Jenkins server we discussed few days ago in IRC. Commit message has more details.

[Stevan Radaković (stevanr)]

Looks good.
Approve +1.

review: Approve

=== modified file 'dashboard/frontend/management/commands/jenkins.py'
--- dashboard/frontend/management/commands/jenkins.py	2012-09-12 11:50:06 +0000
+++ dashboard/frontend/management/commands/jenkins.py	2012-09-18 13:23:21 +0000
@@ -42,6 +42,7 @@
         self.jenkins_user = settings.JENKINS_ADMIN_USER
         self.jenkins_passwd = settings.JENKINS_ADMIN_PASSWD
         self.jenkins_home = settings.JENKINS_HOME
+        self.bzr_home = settings.JENKINS_HOME + "/bzr_home"
         self.jenkins_log = settings.JENKINS_LOG_NAME
         self.jenkins_war_url = settings.JENKINS_WAR_URL
         self.jenkins_id = settings.JENKINS_DB_ID
@@ -82,10 +83,10 @@
         Installs/configure/start the jenkins making sure another
         instance of jenkins is not running on the same self.port.
         """
+        # TODO: Install also OpenID and EC2 plugins
         try:
-            # Download openid plugin
-            cmd = 'mkdir -p %s' % self.jenkins_home
-            self.run(cmd)
+            self.run('mkdir -p %s' % self.jenkins_home)
+            self.run('mkdir -p %s' % self.bzr_home)
 
             # Stop any jenkins which is already running on the same port
             cmd = "lsof -w -n -i tcp:%s | awk -F ' ' '{print $2}' | " \
@@ -176,7 +177,8 @@
         log_fn = os.path.join(self.jenkins_home, self.jenkins_log)
         log_fd = open(log_fn, 'a')
         ret = Popen(cmd, stdout=log_fd, stderr=STDOUT,
-                    env={"JENKINS_HOME": self.jenkins_home})
+                    env={"JENKINS_HOME": self.jenkins_home,
+                         "BZR_HOME": self.bzr_home})
 
         if ret.returncode:
             raise CalledProcessError(1, cmd, 'cmd Failed')