Fix #312

Author: ib-steffen

docs/job/badges.md

@@ -28,6 +28,8 @@ Template         | Meaning                   | Optional
 `<subject>`      | Badge subject             | False
 `<job_name>`     | Fully-qualified job name  | False
 `<branch>`       | Git branch                | True
+`<build_number>` | Build number i.e. `432`   | True
+`<build_restart_counter>` | Restart counter, default `1` | True
 
 
 Additionally, there are also two job-independent badges:
@@ -36,4 +38,3 @@ Additionally, there are also two job-independent badges:
 - `<infrabox-url>/api/v1/projects/<project-id>/tests.svg?branch=<branch>&job_name=<job_name>` showing the amount of passing jobs of given job for the build
 
 Markdown code suitable for embedding can be retrieved from the "Settings" tab of your project (requires administrator privileges).
-

src/api/handlers/project.py

@@ -80,6 +80,9 @@ def get(self, project_id):
 
         project_type = p['type']
 
+        build_number = request.args.get('build_number', None)
+        build_restart_count = request.args.get('build_restart_counter', 1)
+
         rows = None
         if request.args.get('branch', None) and project_type in ('github', 'gerrit'):
             rows = g.db.execute_many_dict('''
@@ -97,6 +100,18 @@ def get(self, project_id):
                     LIMIT 1
                 )
             ''', [project_id, project_id, request.args['branch']])
+        elif build_number and build_restart_count:
+            rows = g.db.execute_many_dict('''
+                SELECT state FROM job j
+                WHERE j.project_id = %s
+                AND j.build_id = (
+                    SELECT id
+                    FROM build
+                    WHERE project_id = %s
+                    AND build_number = %s
+                    AND restart_counter = %s
+                )
+            ''', [project_id, project_id, build_number, build_restart_count])
         else:
             rows = g.db.execute_many_dict('''
                 SELECT state FROM job j
@@ -127,6 +142,10 @@ def get(self, project_id):
                 status = state
                 color = 'red'
 
+            if state == 'unstable':
+                status = state
+                color = 'yellow'
+
         return get_badge('infrabox', status, color)
 
 @ns.route('/tests.svg')
@@ -140,6 +159,8 @@ def get(self, project_id):
         '''
         branch = request.args.get('branch', None)
         job_name = request.args.get('job_name', '%')
+        build_number = request.args.get('build_number', None)
+        build_restart_count = request.args.get('build_restart_counter', 1)
 
         p = g.db.execute_one_dict('''
             SELECT type FROM project WHERE id = %s
@@ -180,6 +201,35 @@ def get(self, project_id):
                             AND j.name LIKE %s
                     )
             ''', [project_id, project_id, project_id, project_id, branch, job_name])
+        elif build_number and build_restart_count:
+            r = g.db.execute_one_dict('''
+                SELECT
+                    count(CASE WHEN tr.state = 'ok' THEN 1 END) success,
+                    count(CASE WHEN tr.state = 'failure' THEN 1 END) failure,
+                    count(CASE WHEN tr.state = 'error' THEN 1 END) error,
+                    count(CASE WHEN tr.state = 'skipped' THEN 1 END) skipped
+                FROM test_run tr
+                WHERE  tr.project_id = %s
+                    AND tr.job_id IN (
+                        SELECT j.id
+                        FROM job j
+                        WHERE j.project_id = %s
+                            AND j.build_id = (
+                                SELECT b.id
+                                FROM build b
+                                INNER JOIN job j
+                                ON b.id = j.build_id
+                                    AND j.state in ('finished', 'unstable')
+                                    AND b.project_id = %s
+                                    AND j.project_id = %s
+                                    AND j.name LIKE %s
+                                    AND b.build_number = %s
+                                    AND b.restart_counter = %s
+                                    LIMIT 1
+                            )
+                            AND j.name LIKE %s
+                    )
+            ''', [project_id, project_id, project_id, project_id, job_name, build_number, build_restart_count, job_name])
         else:
             r = g.db.execute_one_dict('''
                 SELECT
@@ -226,6 +276,9 @@ def get(self, project_id):
         job_name = request.args.get('job_name', None)
         subject = request.args.get('subject', None)
         branch = request.args.get('branch', None)
+        build_number = request.args.get('build_number', None)
+        build_restart_count = request.args.get('build_restart_counter', 1)
+
         p = g.db.execute_one_dict('''
             SELECT type FROM project WHERE id = %s
         ''', [project_id])
@@ -252,6 +305,22 @@ def get(self, project_id):
                 ORDER BY j.end_date desc
                 LIMIT 1
             ''', [project_id, job_name, subject, project_id, branch])
+        elif build_number and build_restart_count:
+            badge = g.db.execute_one_dict('''
+                SELECT status, color
+                FROM job_badge jb
+                JOIN job j
+                    ON j.id = jb.job_id
+                    AND j.project_id = %s
+                    AND j.state in ('finished', 'unstable')
+                    AND j.name = %s
+                    AND jb.subject = %s
+                JOIN build b
+                    ON j.build_id = b.id
+                    AND b.project_id = %s
+                    AND b.build_number = %s
+                    AND b.restart_counter = %s
+            ''', [project_id, job_name, subject, project_id, build_number, build_number])
         else:
             badge = g.db.execute_one_dict('''
                 SELECT status, color