Fix job dependencies, simplify naming

1 files changed, 4 insertions, 4 deletions

diff --git a/jenkinstool b/jenkinstool
index a5f1640..dc64b32 100755
--- a/jenkinstool
+++ b/jenkinstool
@@ -73,6 +73,7 @@ class JobGenerator(object):
         
         for host in config['hosts']:
             jc = self.pbuilder_create_job(host)
+            trigger.add_build_trigger(jc.job_id())
             jobs.append(jc)
         
         for project in config['projects']:
@@ -200,7 +201,7 @@ fi
             if host['debian-dist'] not in done:
                 jobs.append(self.dsc_job(host, project))
                 jobs.append(self.process_incoming_job(
-                    config, 'dsc_%s' % host['debian-dist']))
+                    config, project, 'dsc_%s' % host['name']))
                 done.add(host['debian-dist'])
 
         build_all_dists = set()
@@ -209,7 +210,7 @@ fi
             build_all_dists.add(host['debian-dist'])
             jobs.append(self.deb_job(host, project, build_all))
             jobs.append(self.process_incoming_job(
-                config, 'deb_%s' % host['name']))
+                config, project, 'deb_%s' % host['name']))
 
         for i in range(1, len(jobs)):
             prev = jobs[i-1]
@@ -279,11 +280,10 @@ dput -f "%(global.dput-host)s" "../${sourcepkg}_${version}-1_source.changes"
         
         return jc
 
-    def process_incoming_job(self, config, suffix):
+    def process_incoming_job(self, config, project, suffix):
         '''Create job that processing reprepro's incoming queue.'''
 
         host = { 'name': 'localhost' }
-        project = { 'name': 'incoming' }
         jc = self.create_job_config(host, project, 'incoming_' + suffix)
         jc.set_description('Process reprepro incoming queue')
         jc.add_shell_command(