Make UI render

diff --git a/test.py b/test.py
index 34470d426d4faec08f1b5ebc1b4779cfde8f7baf..76898c181dbeb343e9de72588047e33311b0c0fb 100644 (file)
--- a/test.py
+++ b/test.py
@@ -1,3 +1,4 @@
+import datetime
 import os
 import unittest
 import flask_migrate
@@ -75,5 +76,18 @@ class TestWebhooks(UsesModels):
         assert build.build_id == 1
         assert build.build_runner_id == "foobar"
 
+class TestWeb(UsesModels):
+
+    def test_home(self):
+        build1 = Build(build_id=1)
+        runner = Runner(runner_name="foobar", runner_id="foobar")
+        build2 = Build(build_id=2, build_status="success", build_device="mako", build_version="cm-14.1", build_type="userdebug", build_date=datetime.datetime.now(), build_runner=runner)
+        db.session.add(build1)
+        db.session.add(runner)
+        db.session.add(build2)
+        db.session.commit()
+        response = self.client.get("/")
+        assert response.status_code == 200
+
 if __name__ == "__main__":
     unittest.main()

diff --git a/ui/app.py b/ui/app.py
index e693962e875ba3c0ef346e6f8ede6c7607fed24f..07e385ccfcee331aa4f208fca6ea913df2d4c1d2 100644 (file)
--- a/ui/app.py
+++ b/ui/app.py
@@ -19,7 +19,7 @@ headers = {'Private-Token': os.environ.get('GITLAB_TOKEN', '')}
 
 @app.route('/')
 def main():
-    return render_template('index.html')
+    return render_template('index.html', builds=models.Build.query.all())
 
 @app.route("/webhook", methods=('POST',))
 def process_webhook():

diff --git a/ui/config.py b/ui/config.py
index 46023703f929e91e15cfdc5aba5f9f03a2dbb4b4..74c624d15bf11f34aff1902d256a62b5058c063f 100644 (file)
--- a/ui/config.py
+++ b/ui/config.py
@@ -3,6 +3,6 @@ import os
 SQLALCHEMY_DATABASE_URI = os.environ.get("SQLALCHEMY_DATABASE_URI", 'sqlite:////tmp/ui.db')
 CACHE_TYPE = 'simple'
 
-GITLAB_WEBHOOK_TOKEN = 'secret'
+GITLAB_WEBHOOK_TOKEN = os.environ.get("GITLAB_WEBHOOK_TOKEN", "secret")
 
 PRESERVE_CONTEXT_ON_EXCEPTION = False

diff --git a/ui/templates/index.html b/ui/templates/index.html
index 6de2b91c8551c1c356bdbc5fbe49abbf9d128e6a..431181657c1ae9e0ce4e2c6937e3720837260fee 100644 (file)
--- a/ui/templates/index.html
+++ b/ui/templates/index.html
@@ -13,15 +13,17 @@
                 <th>Version</th>
                 <th>Type</th>
                 <th>Date</th>
+                <th>Runner</th>
             </tr>
             {% for build in builds %}
             <tr>
-                <td>{{build.id}}</td>
-                <td>{{build.status}}</td>
-                <td>{{build.device}}</td>
-                <td>{{build.version}}</td>
-                <td>{{build.type}}</td>
-                <td>{{build.date}}</td>
+                <td><a href="https://gitlab.com/LineageOS/builder/lineage_builder/pipelines/{{build.build_id}}">{{build.build_id}}</a></td>
+                <td>{{build.build_status}}</td>
+                <td>{{build.build_device}}</td>
+                <td>{{build.build_version}}</td>
+                <td>{{build.build_type}}</td>
+                <td>{{build.build_date}}</td>
+                <td><a href="/runners/{{build.build_runner.runner_name}}">{{build.build_runner.runner_name}}</a></td>
             </tr>
             {% endfor %}
         </table>