Merge pull request #90 from SAP/fixes

Fixes

Author: ib-steffen

infrabox/utils/storage/docker-compose.yml

@@ -10,13 +10,6 @@ services:
         ports:
             - "9009:9000"
 
-    minio-init:
-        build:
-            context: ../../../
-            dockerfile: src/docker-compose/minio-init/Dockerfile
-        links:
-            - minio
-
     postgres:
         build:
             context: ../../../

src/github/trigger/trigger.py

@@ -138,6 +138,20 @@ def create_job(self, commit_id, clone_url, build_id, project_id, github_private_
                     'Create Jobs', %s, false, '', 1, 1024, %s, %s, null)
         ''', [build_id, project_id, json.dumps(git_repo), env], fetch=False)
 
+    def has_active_build(self, commit_id, project_id):
+        result = self.execute('''
+            SELECT count(*)
+            FROM job
+            JOIN build ON job.build_id = build.id
+            JOIN "commit" ON build.commit_id = "commit".id and build.project_id = commit.project_id
+            WHERE "commit".id = %s AND commit.project_id = %s AND job.state IN ('running', 'queued', 'scheduled')
+            GROUP BY job.state
+        ''', [commit_id, project_id])
+
+        if result:
+            return True
+
+        return False
 
     def create_push(self, c, repository, branch, tag):
         if not c['distinct']:
@@ -162,6 +176,9 @@ def create_push(self, c, repository, branch, tag):
 
         commit_id = c['id']
 
+        if self.has_active_build(commit_id, project_id):
+            return
+
         if not result:
             status_url = repository['statuses_url'].format(sha=c['id'])
             result = self.execute('''
@@ -364,6 +381,10 @@ def handle_pull_request(self, event):
                 return res(200, 'build already triggered')
 
         commit_id = result[0][0]
+
+        if self.has_active_build(commit_id, project_id):
+            return res(200, 'build already triggered')
+
         build_id = self.create_build(commit_id, project_id)
         self.create_job(event['pull_request']['head']['sha'],
                         event['pull_request']['head']['repo']['clone_url'],