Make build_url nullable

Author: JelteF

pgcommitfest/commitfest/models.py

@@ -932,8 +932,9 @@ class CfbotBranch(models.Model):
     commit_id = models.TextField(null=True, blank=True)
     apply_url = models.TextField(null=False)
     # URL of the CI build for this branch. Sent by cfbot so we don't have to
-    # know which CI provider it uses.
-    build_url = models.TextField(null=False)
+    # know which CI provider it uses. It's null until cfbot hears about the
+    # branch's first build, and "timeout" branches might never get one.
+    build_url = models.TextField(null=True, blank=True)
     # Actually a postgres enum column
     status = models.TextField(choices=STATUS_CHOICES, null=False)
     needs_rebase_since = models.DateTimeField(null=True, blank=True)

pgcommitfest/commitfest/templates/commitfest.html

@@ -74,7 +74,9 @@ <h3>{{p.is_open|yesno:"Active patches,Closed patches"}}</h3>
       </a>
      {%else%}
       <a href="https://github.com/postgresql-cfbot/postgresql/compare/cf/{{p.id}}~1...cf/{{p.id}}" title="View last patch set on GitHub"><img class="github-logo" src="/media/commitfest/github-mark.svg"/></a>
-      <a href="{{cfb.build_url}}"
+      {# Until cfbot has seen the branch's first build there is no build_url, #}
+      {# in that case we show the status icon and counters without a link. #}
+      {%if cfb.build_url%}<a href="{{cfb.build_url}}"{%else%}<span{%endif%}
          title="View CI history. {%if p.failing_since%}Failing {% cfsince p.failing_since %}. {%endif%}{%if cfb.failed_task_names %}Failed jobs: {{cfb.failed_task_names}}{%endif%}">
        {%if cfb.branch_status == 'failed' or cfb.branch_status == 'timeout' or cfb.failed_non_formatting > 0 %}
         <img src="/media/commitfest/new_failure.svg"/>
@@ -88,7 +90,7 @@ <h3>{{p.is_open|yesno:"Active patches,Closed patches"}}</h3>
        <span class="run-counters">
         {{cfb.completed}}/{{cfb.total}}
        </span>
-      </a>
+      {%if cfb.build_url%}</a>{%else%}</span>{%endif%}
      {%endif%}
      </td>
      <td>

pgcommitfest/commitfest/templates/home.html

@@ -180,7 +180,9 @@ <h3>{%if user.is_authenticated%}Open patches you are subscribed to{%elif p.is_op
        </a>
       {%else%}
        <a href="https://github.com/postgresql-cfbot/postgresql/compare/cf/{{p.id}}~1...cf/{{p.id}}" title="View last patch set on GitHub"><img class="github-logo" src="/media/commitfest/github-mark.svg"/></a>
-       <a href="{{cfb.build_url}}"
+       {# Until cfbot has seen the branch's first build there is no build_url, #}
+       {# in that case we show the status icon and counters without a link. #}
+       {%if cfb.build_url%}<a href="{{cfb.build_url}}"{%else%}<span{%endif%}
           title="View CI history. {%if p.failing_since%}Failing {% cfsince p.failing_since %}. {%endif%}{%if cfb.failed_task_names %}Failed jobs: {{cfb.failed_task_names}}{%endif%}">
         {%if cfb.branch_status == 'failed' or cfb.branch_status == 'timeout' or cfb.failed_non_formatting > 0 %}
          <img src="/media/commitfest/new_failure.svg"/>
@@ -194,7 +196,7 @@ <h3>{%if user.is_authenticated%}Open patches you are subscribed to{%elif p.is_op
         <span class="run-counters">
          {{cfb.completed}}/{{cfb.total}}
         </span>
-       </a>
+       {%if cfb.build_url%}</a>{%else%}</span>{%endif%}
       {%endif%}
       </td>
       <td>

pgcommitfest/commitfest/templates/patch.html

@@ -29,12 +29,16 @@
        <span class="badge bg-warning" title="View git apply logs">Needs rebase!</span></a>
       Needs rebase {% cfsince cfbot_branch.needs_rebase_since %}. {%if cfbot_branch.failing_since and cfbot_branch.failing_since != cfbot_branch.needs_rebase_since %}Failing {% cfsince cfbot_branch.failing_since %}. {%endif%}<br>Additional links previous successfully applied patch (outdated):<br>
       <a href="https://github.com/postgresql-cfbot/postgresql/compare/cf/{{patch.id}}~1...cf/{{patch.id}}" title="View previous successfully applied patch set on GitHub"><img class="github-logo" src="/media/commitfest/github-mark.svg"/></a>
-      <a href="{{cfbot_branch.build_url}}">
-       <span class="badge bg-secondary">Summary</span></a>
+      {%if cfbot_branch.build_url%}
+       <a href="{{cfbot_branch.build_url}}">
+        <span class="badge bg-secondary">Summary</span></a>
+      {%endif%}
      {%else%}
       <a href="https://github.com/postgresql-cfbot/postgresql/compare/cf/{{patch.id}}~1...cf/{{patch.id}}" title="View last patch set on GitHub"><img class="github-logo" src="/media/commitfest/github-mark.svg"/></a>
-      <a href="{{cfbot_branch.build_url}}">
-       <span class="badge bg-secondary">Summary</span></a>
+      {%if cfbot_branch.build_url%}
+       <a href="{{cfbot_branch.build_url}}">
+        <span class="badge bg-secondary">Summary</span></a>
+      {%endif%}
       {%for c in cfbot_tasks %}
        {%if c.status == 'COMPLETED'%}
         <a href="{{c.task_url}}" title="{{c.task_name}}: {{c.status}}"><img src="/media/commitfest/new_success.svg"/></a>

pgcommitfest/commitfest/views.py

@@ -1600,7 +1600,7 @@ def cfbot_ingest(message):
             branch_status["branch_name"],
             branch_status["commit_id"],
             branch_status["apply_url"],
-            branch_status.get("build_url", ""),
+            branch_status["build_url"],
             branch_status["status"],
             branch_status["created"],
             branch_status["modified"],
@@ -1642,7 +1642,7 @@ def cfbot_ingest(message):
                         WHERE commitfest_cfbottask.modified < EXCLUDED.modified""",
                 (
                     task_status["task_id"],
-                    task_status.get("task_url", ""),
+                    task_status["task_url"],
                     task_status["task_name"],
                     patch_id,
                     branch_id,