From 19e7114f0ee288057b2e33e3feee25b348645603 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 13 Apr 2015 14:36:00 +0200
Subject: [PATCH 01/16] Add channel as a product type.

Currently I'm using a (not very well) downscaled version of the NixOS
logo, so we want to replace it by a proper image ASAP.

Other than that, the idea is to have something like this in
hydra-build-products:

file channel $out/channel.tar.bz2

Right now of course, it's only displayed at the corresponding builds, so
we might want to have aggregates on all channels for a project, jobset
or maybe even single jobs?

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 src/root/product-list.tt           |   2 ++
 src/root/static/images/channel.png | Bin 0 -> 1634 bytes
 2 files changed, 2 insertions(+)
 create mode 100644 src/root/static/images/channel.png

diff --git a/src/root/product-list.tt b/src/root/product-list.tt
index 7870834f..498818c2 100644
--- a/src/root/product-list.tt
+++ b/src/root/product-list.tt
@@ -136,6 +136,8 @@
             <img src="[% c.uri_for("/static/images/iso.png") %]" alt="ISO" /> ISO-9660 CD/DVD image <tt>[% product.name %]</tt>
           [% CASE "binary-dist" %]
             <img src="[% c.uri_for("/static/images/binary-dist.png") %]" alt="Binary distribution" /> Binary distribution <tt>[% product.name %]</tt>
+          [% CASE "channel" %]
+            <img src="[% c.uri_for("/static/images/channel.png") %]" alt="Channel" /> Channel expressions <tt>[% product.name %]</tt>
           [% CASE DEFAULT %]
             File <tt>[% product.name %]</tt> of type <tt>[% product.subtype %]</tt>
           [% END %]
diff --git a/src/root/static/images/channel.png b/src/root/static/images/channel.png
new file mode 100644
index 0000000000000000000000000000000000000000..73c296ec63d26cca6d1e9353c7f4e666ea82f96c
GIT binary patch
literal 1634
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

literal 0
HcmV?d00001


From 7b60aed5ed5133e759da3f7f1f9dff2ffd25ddd8 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 14 Apr 2015 08:58:55 +0200
Subject: [PATCH 02/16] jobset: Add a new "channels" tab.

It's very similar to "jobs" and the code is pretty much the same, except
that we don't do filtering on it. At least it doesn't waste space for a
filter option when there are usually WAY less channel jobs than ordinary
jobs.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 src/lib/Hydra/Controller/Jobset.pm | 40 ++++++++++++++++++++++++++++++
 src/root/jobset-channels-tab.tt    | 34 +++++++++++++++++++++++++
 src/root/jobset.tt                 |  3 +++
 3 files changed, 77 insertions(+)
 create mode 100644 src/root/jobset-channels-tab.tt

diff --git a/src/lib/Hydra/Controller/Jobset.pm b/src/lib/Hydra/Controller/Jobset.pm
index 1d1cce63..d4a0eb5f 100644
--- a/src/lib/Hydra/Controller/Jobset.pm
+++ b/src/lib/Hydra/Controller/Jobset.pm
@@ -145,6 +145,46 @@ sub jobs_tab : Chained('jobsetChain') PathPart('jobs-tab') Args(0) {
 }
 
 
+# XXX: Pretty much a rip-off of jobs-tab, make it DRY!
+sub channels_tab : Chained('jobsetChain') PathPart('channels-tab') Args(0) {
+    my ($self, $c) = @_;
+    $c->stash->{template} = 'jobset-channels-tab.tt';
+
+    my @evals = $c->stash->{jobset}->jobsetevals->search(
+        { hasnewbuilds => 1},
+        { order_by => "id desc", rows => 20 }
+    );
+
+    my $evals = {};
+    my %channels;
+
+    foreach my $eval (@evals) {
+        my @builds = $eval->builds->search(
+            { 'buildproducts.type' => 'file'
+            , 'buildproducts.subtype' => 'channel' },
+            { join => ["buildproducts"]
+            , columns => ['id', 'job', 'finished', 'buildstatus'] }
+        );
+        foreach my $b (@builds) {
+            my $jobName = $b->get_column('job');
+
+            $evals->{$eval->id}->{timestamp} = $eval->timestamp;
+            $evals->{$eval->id}->{channels}->{$jobName} = {
+                id => $b->id,
+                finished => $b->finished,
+                buildstatus => $b->buildstatus
+            };
+
+            $channels{$jobName} = 1;
+        }
+    }
+
+    $c->stash->{evals} = $evals;
+    my @channels = sort (keys %channels);
+    $c->stash->{channels} = [@channels];
+}
+
+
 # Hydra::Base::Controller::ListBuilds needs this.
 sub get_builds : Chained('jobsetChain') PathPart('') CaptureArgs(0) {
     my ($self, $c) = @_;
diff --git a/src/root/jobset-channels-tab.tt b/src/root/jobset-channels-tab.tt
new file mode 100644
index 00000000..2a5f72a5
--- /dev/null
+++ b/src/root/jobset-channels-tab.tt
@@ -0,0 +1,34 @@
+[% PROCESS common.tt %]
+
+[% IF channels.size == 0 %]
+
+  <div class="alert">There are no channels available.</div>
+
+[% ELSE %]
+
+  [% evalIds = evals.keys.nsort.reverse %]
+  <table class="table table-striped table-condensed table-header-rotated">
+    <thead>
+      <tr>
+        <th style="width: 1em;">Channel</th>
+        [% FOREACH eval IN evalIds %]
+          <th class="rotate-45">
+            <div><span>
+              <a href="[% c.uri_for('/eval' eval) %]">[% INCLUDE renderRelativeDate timestamp=evals.$eval.timestamp %]</a>
+            </span></div></th>
+        [% END %]
+      </tr>
+    </thead>
+    <tbody>
+      [% FOREACH chan IN channels-%]
+        <tr>
+          <th><span>[% INCLUDE renderJobName project=project.name jobset=jobset.name job=chan %]</span></th>
+          [% FOREACH eval IN evalIds %]
+            <td>[% r = evals.$eval.channels.$chan; IF r.id %]<a href="[% c.uri_for('/build' r.id) %]">[% INCLUDE renderBuildStatusIcon size=16 build=r %]</a>[% END %]</td>
+          [% END %]
+        </tr>
+      [% END %]
+    </tbody>
+  </table>
+
+[% END %]
diff --git a/src/root/jobset.tt b/src/root/jobset.tt
index 63ef29b9..04b0efaf 100644
--- a/src/root/jobset.tt
+++ b/src/root/jobset.tt
@@ -64,6 +64,7 @@
   <li><a href="#tabs-jobs" data-toggle="tab">Jobs</a></li>
   <li><a href="#tabs-configuration" data-toggle="tab">Configuration</a></li>
   <li><a href="#tabs-links" data-toggle="tab">Links</a></li>
+  <li><a href="#tabs-channels" data-toggle="tab">Channels</a></li>
 </ul>
 
 <div id="generic-tabs" class="tab-content">
@@ -165,6 +166,8 @@
     </ul>
   </div>
 
+  [% INCLUDE makeLazyTab tabName="tabs-channels" uri=c.uri_for('/jobset' project.name jobset.name "channels-tab") %]
+
 </div>
 
 <script>

From f6bb8afc300a4eca6b343577db9b343ee87937d2 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 21 Apr 2015 03:58:51 +0200
Subject: [PATCH 03/16] Show build products on aggregates with channels.

This is to get a bit more consistency among channel builds but doesn't
do a radical change on the display. Ideally we may want to have a
channel overview with all the constituents and a small help showing how
the user can add the channel.

Unfortunately, this also introduces an inconsistency: We previously used
the *subtype* "channel", but now we're expecting "channel" as the type
of the product, so we need to change this for the channels overview as
well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 src/lib/Hydra/Controller/Build.pm | 4 ++++
 src/root/build.tt                 | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/lib/Hydra/Controller/Build.pm b/src/lib/Hydra/Controller/Build.pm
index 0ab0832e..09018b5d 100644
--- a/src/lib/Hydra/Controller/Build.pm
+++ b/src/lib/Hydra/Controller/Build.pm
@@ -108,6 +108,10 @@ sub build_GET {
 
     # If this is an aggregate build, get its constituents.
     $c->stash->{constituents} = [$c->stash->{build}->constituents_->search({}, {order_by => ["job"]})];
+
+    $c->stash->{isChannel} = $c->stash->{build}->buildproducts->search(
+        {type => "channel"}
+    )->count > 0;
 }
 
 
diff --git a/src/root/build.tt b/src/root/build.tt
index ec1fe10a..288af542 100644
--- a/src/root/build.tt
+++ b/src/root/build.tt
@@ -188,7 +188,7 @@
                 <td>[% IF cachedBuild; INCLUDE renderFullBuildLink build=cachedBuild; ELSE %]<em>unknown</em>[% END %]</td>
               </tr>
             [% END %]
-            [% IF !isAggregate && build.finished; actualBuild = build.iscachedbuild ? cachedBuild : build %]
+            [% IF (!isAggregate || !isChannel) && build.finished; actualBuild = build.iscachedbuild ? cachedBuild : build %]
               [% IF actualBuild %]
                 <tr>
                   <th>Duration:</th>
@@ -200,7 +200,7 @@
                 <td>[% INCLUDE renderDateTime timestamp = build.stoptime; %]</td>
               </tr>
             [% END %]
-            [% IF !isAggregate && buildLogExists(build) %]
+            [% IF (!isAggregate || !isChannel) && buildLogExists(build) %]
               <tr>
                 <th>Logfile:</th>
                 <td>
@@ -215,7 +215,7 @@
       </tr>
     </table>
 
-    [% IF build.buildproducts && !isAggregate %]
+    [% IF isChannel || (build.buildproducts && !isAggregate) %]
 
       <h3>Build products</h3>
 

From a235de3ad71a490c82a07e67e8236ab4b20cd51c Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 21 Apr 2015 04:22:37 +0200
Subject: [PATCH 04/16] Make channels a product type instead of subtype.

Now we can provide different channel expressions for one particular
channel build. Not sure yet how this would be useful, but I found it
more appropriate to use a type instead of a subtype of "file".

This should get us consistent with the provious commit.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 src/lib/Hydra/Controller/Jobset.pm |  3 +--
 src/root/product-list.tt           | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/lib/Hydra/Controller/Jobset.pm b/src/lib/Hydra/Controller/Jobset.pm
index d4a0eb5f..92bede32 100644
--- a/src/lib/Hydra/Controller/Jobset.pm
+++ b/src/lib/Hydra/Controller/Jobset.pm
@@ -160,8 +160,7 @@ sub channels_tab : Chained('jobsetChain') PathPart('channels-tab') Args(0) {
 
     foreach my $eval (@evals) {
         my @builds = $eval->builds->search(
-            { 'buildproducts.type' => 'file'
-            , 'buildproducts.subtype' => 'channel' },
+            { 'buildproducts.type' => 'channel' },
             { join => ["buildproducts"]
             , columns => ['id', 'job', 'finished', 'buildstatus'] }
         );
diff --git a/src/root/product-list.tt b/src/root/product-list.tt
index 498818c2..5eef9640 100644
--- a/src/root/product-list.tt
+++ b/src/root/product-list.tt
@@ -115,8 +115,19 @@
 
             </td>
           </tr>
+        [% END %]
 
-      [% END %]
+      [% CASE "channel" %]
+
+      <tr class="product">
+        <td>
+          <a href="[% uri %]">
+            <img src="[% c.uri_for("/static/images/channel.png") %]" alt="Channel" />
+            Channel expression tarball <tt>[% product.name %]</tt>
+            [% IF product.subtype != "-" %]for <tt>[% product.subtype %]</tt>[% END %]
+          </a>
+        </td>
+      </tr>
 
       [% CASE "file" %]
 
@@ -136,8 +147,6 @@
             <img src="[% c.uri_for("/static/images/iso.png") %]" alt="ISO" /> ISO-9660 CD/DVD image <tt>[% product.name %]</tt>
           [% CASE "binary-dist" %]
             <img src="[% c.uri_for("/static/images/binary-dist.png") %]" alt="Binary distribution" /> Binary distribution <tt>[% product.name %]</tt>
-          [% CASE "channel" %]
-            <img src="[% c.uri_for("/static/images/channel.png") %]" alt="Channel" /> Channel expressions <tt>[% product.name %]</tt>
           [% CASE DEFAULT %]
             File <tt>[% product.name %]</tt> of type <tt>[% product.subtype %]</tt>
           [% END %]

From 06b76ab275caa600f702fdb8e79ea2e312c57a67 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 21 Apr 2015 07:45:50 +0200
Subject: [PATCH 05/16] Add isChannel column and meta attribute.

This is to properly separate channels from regular jobs and also make
sure that we can always iterate on them, no matter whether the build has
failed. The reason why we were not able to do this until now was because
we were iterating on the build products, and whenever some constituent
of a channel job has failed, we didn't get a build output.

So whenever there is a meta.isHydraChannel, we can now properly
distinguish it from the other jobs.

I still don't have any clue, why "make -C src/sql update-dbix" without
*any* modifications tries to create additional schema definitions. But
I've checked the md5sums of the existing schema definitions and they
don't seem to match, so it seems that they already have been tampered
with.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 src/hydra-eval-jobs/hydra-eval-jobs.cc |  1 +
 src/lib/Hydra/Helper/AddBuilds.pm      |  1 +
 src/lib/Hydra/Schema/Builds.pm         | 12 ++++++++++--
 src/sql/hydra.sql                      |  1 +
 src/sql/upgrade-42.sql                 |  1 +
 5 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 src/sql/upgrade-42.sql

diff --git a/src/hydra-eval-jobs/hydra-eval-jobs.cc b/src/hydra-eval-jobs/hydra-eval-jobs.cc
index 7fadef71..ff3eef7c 100644
--- a/src/hydra-eval-jobs/hydra-eval-jobs.cc
+++ b/src/hydra-eval-jobs/hydra-eval-jobs.cc
@@ -127,6 +127,7 @@ static void findJobsWrapped(EvalState & state, JSONObject & top,
             res.attr("schedulingPriority", drv.queryMetaInt("schedulingPriority", 100));
             res.attr("timeout", drv.queryMetaInt("timeout", 36000));
             res.attr("maxSilent", drv.queryMetaInt("maxSilent", 7200));
+            res.attr("isChannel", drv.queryMetaBool("isHydraChannel", false));
 
             /* If this is an aggregate, then get its constituents. */
             Bindings::iterator a = v.attrs->find(state.symbols.create("_hydraAggregate"));
diff --git a/src/lib/Hydra/Helper/AddBuilds.pm b/src/lib/Hydra/Helper/AddBuilds.pm
index 773b850d..aa7aa343 100644
--- a/src/lib/Hydra/Helper/AddBuilds.pm
+++ b/src/lib/Hydra/Helper/AddBuilds.pm
@@ -448,6 +448,7 @@ sub checkBuild {
             , busy => 0
             , locker => ""
             , iscurrent => 1
+            , ischannel => $buildInfo->{isChannel}
             });
 
         $build->buildoutputs->create({ name => $_, path => $buildInfo->{outputs}->{$_} })
diff --git a/src/lib/Hydra/Schema/Builds.pm b/src/lib/Hydra/Schema/Builds.pm
index b9dc0437..a22cd670 100644
--- a/src/lib/Hydra/Schema/Builds.pm
+++ b/src/lib/Hydra/Schema/Builds.pm
@@ -116,6 +116,12 @@ __PACKAGE__->table("Builds");
   default_value: 36000
   is_nullable: 1
 
+=head2 ischannel
+
+  data_type: 'integer'
+  default_value: 0
+  is_nullable: 1
+
 =head2 iscurrent
 
   data_type: 'integer'
@@ -239,6 +245,8 @@ __PACKAGE__->add_columns(
   { data_type => "integer", default_value => 3600, is_nullable => 1 },
   "timeout",
   { data_type => "integer", default_value => 36000, is_nullable => 1 },
+  "ischannel",
+  { data_type => "integer", default_value => 0, is_nullable => 1 },
   "iscurrent",
   { data_type => "integer", default_value => 0, is_nullable => 1 },
   "nixexprinput",
@@ -558,8 +566,8 @@ __PACKAGE__->many_to_many(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07043 @ 2015-08-10 15:10:41
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:rjifgnPtjY96MaQ7eiGzaA
+# Created by DBIx::Class::Schema::Loader v0.07043 @ 2015-09-10 17:34:23
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:JRelp13Cyfi+QVxC92xuqQ
 
 __PACKAGE__->has_many(
   "dependents",
diff --git a/src/sql/hydra.sql b/src/sql/hydra.sql
index 15766402..2b3414ec 100644
--- a/src/sql/hydra.sql
+++ b/src/sql/hydra.sql
@@ -157,6 +157,7 @@ create table Builds (
     maxsilent     integer default 3600, -- meta.maxsilent
     timeout       integer default 36000, -- meta.timeout
 
+    isChannel     integer default 0, -- meta.isHydraChannel
     isCurrent     integer default 0,
 
     -- Copy of the nixExprInput/nixExprPath fields of the jobset that
diff --git a/src/sql/upgrade-42.sql b/src/sql/upgrade-42.sql
new file mode 100644
index 00000000..558a1bea
--- /dev/null
+++ b/src/sql/upgrade-42.sql
@@ -0,0 +1 @@
+alter table Builds add column isChannel integer not null default 0;

From 8f7486cd9c7528c2840585708cc7fa06a3ffd784 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 21 Apr 2015 07:57:36 +0200
Subject: [PATCH 06/16] Jobset.pm: Detect channels by isChannel attribute.

We now no longer need that additional join of the build outputs and can
solely use the isChannel column of the Builds table to determine whether
it's a channel build.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 src/lib/Hydra/Controller/Jobset.pm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/lib/Hydra/Controller/Jobset.pm b/src/lib/Hydra/Controller/Jobset.pm
index 92bede32..558d5706 100644
--- a/src/lib/Hydra/Controller/Jobset.pm
+++ b/src/lib/Hydra/Controller/Jobset.pm
@@ -160,9 +160,8 @@ sub channels_tab : Chained('jobsetChain') PathPart('channels-tab') Args(0) {
 
     foreach my $eval (@evals) {
         my @builds = $eval->builds->search(
-            { 'buildproducts.type' => 'channel' },
-            { join => ["buildproducts"]
-            , columns => ['id', 'job', 'finished', 'buildstatus'] }
+            { ischannel => 1 },
+            { columns => ['id', 'job', 'finished', 'buildstatus'] }
         );
         foreach my $b (@builds) {
             my $jobName = $b->get_column('job');

From ba7402ed6c75becdf4ff0c59ead582cc3b5d341a Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 21 Apr 2015 08:00:14 +0200
Subject: [PATCH 07/16] Jobset.pm: Don't show channels in "Jobs" tab.

Now that we have our dedicated "Channels" tab, there is no need anymore
to show redundant information.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 src/lib/Hydra/Controller/Jobset.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/Hydra/Controller/Jobset.pm b/src/lib/Hydra/Controller/Jobset.pm
index 558d5706..0c830d94 100644
--- a/src/lib/Hydra/Controller/Jobset.pm
+++ b/src/lib/Hydra/Controller/Jobset.pm
@@ -116,7 +116,7 @@ sub jobs_tab : Chained('jobsetChain') PathPart('jobs-tab') Args(0) {
 
     foreach my $eval (@evals) {
         my @builds = $eval->builds->search(
-            { job => { ilike => $filter } },
+            { job => { ilike => $filter }, ischannel => 0 },
             { columns => ['id', 'job', 'finished', 'buildstatus'] });
         foreach my $b (@builds) {
             my $jobName = $b->get_column('job');

From ed361a0145272e8bbbdddb457540be6832c060c4 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 21 Apr 2015 08:09:25 +0200
Subject: [PATCH 08/16] Build.pm: Don't get isChannel using buildproducts.

We now have a column for that, so no need for counting rows which was a
bit inefficient anyway, because we only would have needed the first row
in the result.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 src/lib/Hydra/Controller/Build.pm | 4 ----
 src/root/build.tt                 | 6 +++---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/lib/Hydra/Controller/Build.pm b/src/lib/Hydra/Controller/Build.pm
index 09018b5d..0ab0832e 100644
--- a/src/lib/Hydra/Controller/Build.pm
+++ b/src/lib/Hydra/Controller/Build.pm
@@ -108,10 +108,6 @@ sub build_GET {
 
     # If this is an aggregate build, get its constituents.
     $c->stash->{constituents} = [$c->stash->{build}->constituents_->search({}, {order_by => ["job"]})];
-
-    $c->stash->{isChannel} = $c->stash->{build}->buildproducts->search(
-        {type => "channel"}
-    )->count > 0;
 }
 
 
diff --git a/src/root/build.tt b/src/root/build.tt
index 288af542..c1f223af 100644
--- a/src/root/build.tt
+++ b/src/root/build.tt
@@ -188,7 +188,7 @@
                 <td>[% IF cachedBuild; INCLUDE renderFullBuildLink build=cachedBuild; ELSE %]<em>unknown</em>[% END %]</td>
               </tr>
             [% END %]
-            [% IF (!isAggregate || !isChannel) && build.finished; actualBuild = build.iscachedbuild ? cachedBuild : build %]
+            [% IF (!isAggregate || !build.isChannel) && build.finished; actualBuild = build.iscachedbuild ? cachedBuild : build %]
               [% IF actualBuild %]
                 <tr>
                   <th>Duration:</th>
@@ -200,7 +200,7 @@
                 <td>[% INCLUDE renderDateTime timestamp = build.stoptime; %]</td>
               </tr>
             [% END %]
-            [% IF (!isAggregate || !isChannel) && buildLogExists(build) %]
+            [% IF (!isAggregate || !build.isChannel) && buildLogExists(build) %]
               <tr>
                 <th>Logfile:</th>
                 <td>
@@ -215,7 +215,7 @@
       </tr>
     </table>
 
-    [% IF isChannel || (build.buildproducts && !isAggregate) %]
+    [% IF build.isChannel || (build.buildproducts && !isAggregate) %]
 
       <h3>Build products</h3>
 

From 1fdc258de0d7f97af428de34e8be019fca3db251 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 25 Apr 2015 03:53:57 +0200
Subject: [PATCH 09/16] ListBuilds: Simplify nix channel dispatcher.

We only allow channel/latest anyway, so it really doesn't make sense to
explicitly specify this in the PathPart and provide other dispatcher
once we have more than just "latest", which greatly simplifies the
dispatch tree.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 src/lib/Hydra/Base/Controller/ListBuilds.pm | 25 ++++++++-------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/lib/Hydra/Base/Controller/ListBuilds.pm b/src/lib/Hydra/Base/Controller/ListBuilds.pm
index b971d5e8..2568b117 100644
--- a/src/lib/Hydra/Base/Controller/ListBuilds.pm
+++ b/src/lib/Hydra/Base/Controller/ListBuilds.pm
@@ -32,23 +32,16 @@ sub all : Chained('get_builds') PathPart {
 }
 
 
-sub nix : Chained('get_builds') PathPart('channel') CaptureArgs(1) {
+sub nix : Chained('get_builds') PathPart('channel/latest') CaptureArgs(1) {
     my ($self, $c, $channelName) = @_;
-    eval {
-        if ($channelName eq "latest") {
-            $c->stash->{channelName} = $c->stash->{channelBaseName} . "-latest";
-            $c->stash->{channelBuilds} = $c->stash->{latestSucceeded}
-                ->search_literal("exists (select 1 from buildproducts where build = me.id and type = 'nix-build')")
-                ->search({}, { columns => [@buildListColumns, 'drvpath', 'description', 'homepage']
-                             , join => ["buildoutputs"]
-                             , order_by => ["me.id", "buildoutputs.name"]
-                             , '+select' => ['buildoutputs.path', 'buildoutputs.name'], '+as' => ['outpath', 'outname'] });
-        }
-        else {
-            notFound($c, "Unknown channel `$channelName'.");
-        }
-    };
-    error($c, $@) if $@;
+
+    $c->stash->{channelName} = $c->stash->{channelBaseName} . "-latest";
+    $c->stash->{channelBuilds} = $c->stash->{latestSucceeded}
+        ->search_literal("exists (select 1 from buildproducts where build = me.id and type = 'nix-build')")
+        ->search({}, { columns => [@buildListColumns, 'drvpath', 'description', 'homepage']
+                     , join => ["buildoutputs"]
+                     , order_by => ["me.id", "buildoutputs.name"]
+                     , '+select' => ['buildoutputs.path', 'buildoutputs.name'], '+as' => ['outpath', 'outname'] });
 }
 
 

From c9aadd8b7d40bb5c184054253f79406fca9687ec Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 26 Apr 2015 07:37:37 +0200
Subject: [PATCH 10/16] Jobset.pm: Factor out build->eval mapping.

We now have a searchBuildsAndEvalsForJobset, which creates such a
mapping for us, so we don't need to duplicate code in jobs_tab and
channels_tab.

Also, we're going to use this for the overview of a particular channel
as well, so it makes sense to put it in CatalystUtils instead of
directly in Jobset.pm.

Instead of eval->jobs, it's now eval->builds, because it's really an
aggregate over the builds schema, rather than the job schema.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 src/lib/Hydra/Controller/Jobset.pm    | 62 ++++++---------------------
 src/lib/Hydra/Helper/CatalystUtils.pm | 39 +++++++++++++++++
 src/root/jobset-channels-tab.tt       |  2 +-
 src/root/jobset-jobs-tab.tt           |  2 +-
 4 files changed, 53 insertions(+), 52 deletions(-)

diff --git a/src/lib/Hydra/Controller/Jobset.pm b/src/lib/Hydra/Controller/Jobset.pm
index 0c830d94..f2b801f1 100644
--- a/src/lib/Hydra/Controller/Jobset.pm
+++ b/src/lib/Hydra/Controller/Jobset.pm
@@ -108,77 +108,39 @@ sub jobs_tab : Chained('jobsetChain') PathPart('jobs-tab') Args(0) {
     $c->stash->{filter} = $c->request->params->{filter} // "";
     my $filter = "%" . $c->stash->{filter} . "%";
 
-    my @evals = $c->stash->{jobset}->jobsetevals->search({ hasnewbuilds => 1}, { order_by => "id desc", rows => 20 });
-
-    my $evals = {};
-    my %jobs;
-    my $nrBuilds = 0;
-
-    foreach my $eval (@evals) {
-        my @builds = $eval->builds->search(
-            { job => { ilike => $filter }, ischannel => 0 },
-            { columns => ['id', 'job', 'finished', 'buildstatus'] });
-        foreach my $b (@builds) {
-            my $jobName = $b->get_column('job');
-            $evals->{$eval->id}->{timestamp} = $eval->timestamp;
-            $evals->{$eval->id}->{jobs}->{$jobName} =
-                { id => $b->id, finished => $b->finished, buildstatus => $b->buildstatus };
-            $jobs{$jobName} = 1;
-            $nrBuilds++;
-        }
-        last if $nrBuilds >= 10000;
-    }
+    my ($evals, $builds) = searchBuildsAndEvalsForJobset(
+        $c->stash->{jobset},
+        { job => { ilike => $filter }, ischannel => 0 },
+        10000
+    );
 
     if ($c->request->params->{showInactive}) {
         $c->stash->{showInactive} = 1;
         foreach my $job ($c->stash->{jobset}->jobs->search({ name => { ilike => $filter } })) {
-            next if defined $jobs{$job->name};
-            $c->stash->{inactiveJobs}->{$job->name} = $jobs{$job->name} = 1;
+            next if defined $builds->{$job->name};
+            $c->stash->{inactiveJobs}->{$job->name} = $builds->{$job->name} = 1;
         }
     }
 
     $c->stash->{evals} = $evals;
-    my @jobs = sort (keys %jobs);
+    my @jobs = sort (keys %$builds);
     $c->stash->{nrJobs} = scalar @jobs;
     splice @jobs, 250 if $c->stash->{filter} eq "";
     $c->stash->{jobs} = [@jobs];
 }
 
 
-# XXX: Pretty much a rip-off of jobs-tab, make it DRY!
 sub channels_tab : Chained('jobsetChain') PathPart('channels-tab') Args(0) {
     my ($self, $c) = @_;
     $c->stash->{template} = 'jobset-channels-tab.tt';
 
-    my @evals = $c->stash->{jobset}->jobsetevals->search(
-        { hasnewbuilds => 1},
-        { order_by => "id desc", rows => 20 }
+    my ($evals, $builds) = searchBuildsAndEvalsForJobset(
+        $c->stash->{jobset},
+        { ischannel => 1 }
     );
 
-    my $evals = {};
-    my %channels;
-
-    foreach my $eval (@evals) {
-        my @builds = $eval->builds->search(
-            { ischannel => 1 },
-            { columns => ['id', 'job', 'finished', 'buildstatus'] }
-        );
-        foreach my $b (@builds) {
-            my $jobName = $b->get_column('job');
-
-            $evals->{$eval->id}->{timestamp} = $eval->timestamp;
-            $evals->{$eval->id}->{channels}->{$jobName} = {
-                id => $b->id,
-                finished => $b->finished,
-                buildstatus => $b->buildstatus
-            };
-
-            $channels{$jobName} = 1;
-        }
-    }
-
     $c->stash->{evals} = $evals;
-    my @channels = sort (keys %channels);
+    my @channels = sort (keys %$builds);
     $c->stash->{channels} = [@channels];
 }
 
diff --git a/src/lib/Hydra/Helper/CatalystUtils.pm b/src/lib/Hydra/Helper/CatalystUtils.pm
index d31b3f53..db4640e9 100644
--- a/src/lib/Hydra/Helper/CatalystUtils.pm
+++ b/src/lib/Hydra/Helper/CatalystUtils.pm
@@ -10,6 +10,7 @@ use Hydra::Helper::Nix;
 our @ISA = qw(Exporter);
 our @EXPORT = qw(
     getBuild getPreviousBuild getNextBuild getPreviousSuccessfulBuild
+    searchBuildsAndEvalsForJobset
     error notFound gone accessDenied
     forceLogin requireUser requireProjectOwner requireAdmin requirePost isAdmin isProjectOwner
     trim
@@ -85,6 +86,44 @@ sub getPreviousSuccessfulBuild {
 }
 
 
+sub searchBuildsAndEvalsForJobset {
+    my ($jobset, $condition, $maxBuilds) = @_;
+
+    my @evals = $jobset->jobsetevals->search(
+        { hasnewbuilds => 1},
+        { order_by => "id desc",
+        rows => 20
+    });
+
+    my $evals = {};
+    my %builds;
+    my $nrBuilds = 0;
+
+    foreach my $eval (@evals) {
+        my @allBuilds = $eval->builds->search(
+            $condition,
+            { columns => ['id', 'job', 'finished', 'buildstatus'] }
+        );
+
+        foreach my $b (@allBuilds) {
+            my $jobName = $b->get_column('job');
+
+            $evals->{$eval->id}->{timestamp} = $eval->timestamp;
+            $evals->{$eval->id}->{builds}->{$jobName} = {
+                id => $b->id,
+                finished => $b->finished,
+                buildstatus => $b->buildstatus
+            };
+            $builds{$jobName} = 1;
+            $nrBuilds++;
+        }
+        last if $maxBuilds && $nrBuilds >= $maxBuilds;
+    }
+
+    return ($evals, \%builds);
+}
+
+
 sub error {
     my ($c, $msg, $status) = @_;
     $c->response->status($status) if defined $status;
diff --git a/src/root/jobset-channels-tab.tt b/src/root/jobset-channels-tab.tt
index 2a5f72a5..27d1f4cf 100644
--- a/src/root/jobset-channels-tab.tt
+++ b/src/root/jobset-channels-tab.tt
@@ -24,7 +24,7 @@
         <tr>
           <th><span>[% INCLUDE renderJobName project=project.name jobset=jobset.name job=chan %]</span></th>
           [% FOREACH eval IN evalIds %]
-            <td>[% r = evals.$eval.channels.$chan; IF r.id %]<a href="[% c.uri_for('/build' r.id) %]">[% INCLUDE renderBuildStatusIcon size=16 build=r %]</a>[% END %]</td>
+            <td>[% r = evals.$eval.builds.$chan; IF r.id %]<a href="[% c.uri_for('/build' r.id) %]">[% INCLUDE renderBuildStatusIcon size=16 build=r %]</a>[% END %]</td>
           [% END %]
         </tr>
       [% END %]
diff --git a/src/root/jobset-jobs-tab.tt b/src/root/jobset-jobs-tab.tt
index 3c5b0832..1a9dac17 100644
--- a/src/root/jobset-jobs-tab.tt
+++ b/src/root/jobset-jobs-tab.tt
@@ -59,7 +59,7 @@
         <tr>
           <th><span [% IF inactiveJobs.$j %]class="muted override-link"[% END %]>[% INCLUDE renderJobName project=project.name jobset=jobset.name job=j %]</span></th>
           [% FOREACH eval IN evalIds %]
-            <td>[% r = evals.$eval.jobs.$j; IF r.id %]<a href="[% c.uri_for('/build' r.id) %]">[% INCLUDE renderBuildStatusIcon size=16 build=r %]</a>[% END %]</td>
+            <td>[% r = evals.$eval.builds.$j; IF r.id %]<a href="[% c.uri_for('/build' r.id) %]">[% INCLUDE renderBuildStatusIcon size=16 build=r %]</a>[% END %]</td>
           [% END %]
         </tr>
       [% END %]

From d1de12cac1eb08ee2c8133a3fe41c53ae7d34cee Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 26 Apr 2015 18:01:02 +0200
Subject: [PATCH 11/16] product-list: Handle channel along with "file".

We want to have contents and detauls of channel expressions as well and
we already have that in product.type == file, so why not reuse the same
for the channel expression?

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 src/root/product-list.tt | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/root/product-list.tt b/src/root/product-list.tt
index 5eef9640..17e2911e 100644
--- a/src/root/product-list.tt
+++ b/src/root/product-list.tt
@@ -117,19 +117,7 @@
           </tr>
         [% END %]
 
-      [% CASE "channel" %]
-
-      <tr class="product">
-        <td>
-          <a href="[% uri %]">
-            <img src="[% c.uri_for("/static/images/channel.png") %]" alt="Channel" />
-            Channel expression tarball <tt>[% product.name %]</tt>
-            [% IF product.subtype != "-" %]for <tt>[% product.subtype %]</tt>[% END %]
-          </a>
-        </td>
-      </tr>
-
-      [% CASE "file" %]
+      [% CASE ["file", "channel"] %]
 
       <tr class="product">
         <td>
@@ -148,7 +136,13 @@
           [% CASE "binary-dist" %]
             <img src="[% c.uri_for("/static/images/binary-dist.png") %]" alt="Binary distribution" /> Binary distribution <tt>[% product.name %]</tt>
           [% CASE DEFAULT %]
-            File <tt>[% product.name %]</tt> of type <tt>[% product.subtype %]</tt>
+            [% IF product.type == "channel" %]
+              <img src="[% c.uri_for("/static/images/channel.png") %]" alt="Channel" />
+              Channel expression tarball <tt>[% product.name %]</tt>
+              [% IF product.subtype != "-" %]for <tt>[% product.subtype %]</tt>[% END %]
+            [% ELSE %]
+              File <tt>[% product.name %]</tt> of type <tt>[% product.subtype %]</tt>
+            [% END %]
           [% END %]
         </a>
         [% WRAPPER makePopover title="Details" classes="btn-mini" %]

From f1dd08afc8188b5f3304bbd35c0dbe950bbe3816 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 26 Apr 2015 18:03:42 +0200
Subject: [PATCH 12/16] build.tt: Fix reference to build.ischannel.

It's actually lower-case _despite_ the spelling in the SQL file(s),
because the schema auto-generator from DBIx::Class doesn't take it into
account because it's working on SQLite and the latter seems to ignore
case.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 src/root/build.tt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/root/build.tt b/src/root/build.tt
index c1f223af..8f9c3e36 100644
--- a/src/root/build.tt
+++ b/src/root/build.tt
@@ -188,7 +188,7 @@
                 <td>[% IF cachedBuild; INCLUDE renderFullBuildLink build=cachedBuild; ELSE %]<em>unknown</em>[% END %]</td>
               </tr>
             [% END %]
-            [% IF (!isAggregate || !build.isChannel) && build.finished; actualBuild = build.iscachedbuild ? cachedBuild : build %]
+            [% IF (!isAggregate || !build.ischannel) && build.finished; actualBuild = build.iscachedbuild ? cachedBuild : build %]
               [% IF actualBuild %]
                 <tr>
                   <th>Duration:</th>
@@ -200,7 +200,7 @@
                 <td>[% INCLUDE renderDateTime timestamp = build.stoptime; %]</td>
               </tr>
             [% END %]
-            [% IF (!isAggregate || !build.isChannel) && buildLogExists(build) %]
+            [% IF (!isAggregate || !build.ischannel) && buildLogExists(build) %]
               <tr>
                 <th>Logfile:</th>
                 <td>
@@ -215,7 +215,7 @@
       </tr>
     </table>
 
-    [% IF build.isChannel || (build.buildproducts && !isAggregate) %]
+    [% IF build.ischannel || (build.buildproducts && !isAggregate) %]
 
       <h3>Build products</h3>
 

From db0ef9e49b54969b8e7fd83d775dd2d74d1eaf43 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 27 Apr 2015 03:03:41 +0200
Subject: [PATCH 13/16] Tie custom channels into channel-contents.tt.

We should now get an overview and help text on how to add a particular
channel and also a bit of information about the builds that are required
for a channel to get upgraded.

Right now we only select the latest successful build in the latest
successful evaluation, so if someone wants to have more information about
which channel has failed, (s)he still has to look at the "Channels" tab
of the jobset.

We can make this more fancy at some later point if this is really
needed, because right now we're only interested in the latest build,
because it's the only thing necessary to deliver the channel contents.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 src/lib/Hydra/Base/Controller/NixChannel.pm |  1 +
 src/lib/Hydra/Controller/Channel.pm         | 57 +++++++++++++++++++++
 src/root/channel-contents.tt                | 13 +++++
 src/root/jobset-channels-tab.tt             |  2 +-
 4 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 src/lib/Hydra/Controller/Channel.pm

diff --git a/src/lib/Hydra/Base/Controller/NixChannel.pm b/src/lib/Hydra/Base/Controller/NixChannel.pm
index 19e5bf8e..3d68220c 100644
--- a/src/lib/Hydra/Base/Controller/NixChannel.pm
+++ b/src/lib/Hydra/Base/Controller/NixChannel.pm
@@ -130,6 +130,7 @@ sub channel_contents : Chained('nix') PathPart('') Args(0) {
     # garbage-collected.  That should be true for the "latest"
     # channel.
     getChannelData($c, 0);
+    $c->stash->{genericChannel} = 1;
     $c->stash->{template} = 'channel-contents.tt';
     $c->stash->{nixPkgs} = [sortPkgs @{$c->stash->{nixPkgs}}];
 }
diff --git a/src/lib/Hydra/Controller/Channel.pm b/src/lib/Hydra/Controller/Channel.pm
new file mode 100644
index 00000000..033fc4de
--- /dev/null
+++ b/src/lib/Hydra/Controller/Channel.pm
@@ -0,0 +1,57 @@
+package Hydra::Controller::Channel;
+
+use strict;
+use warnings;
+use base 'Hydra::Base::Controller::REST';
+
+
+sub channel : Chained('/') PathPart('channel/custom') CaptureArgs(3) {
+    my ($self, $c, $projectName, $jobsetName, $channelName) = @_;
+
+    $c->stash->{project} = $c->model('DB::Projects')->find($projectName);
+
+    notFound($c, "Project $projectName doesn't exist.")
+        if !$c->stash->{project};
+
+    $c->stash->{jobset} = $c->stash->{project}->jobsets->find({
+        name => $jobsetName
+    });
+
+    notFound($c, "Jobset $jobsetName doesn't exist.")
+        if !$c->stash->{jobset};
+
+    my $lastSuccessful = $c->model('DB::Builds')->find(
+        { 'eval.hasnewbuilds' => 1
+        , project => $projectName
+        , jobset => $jobsetName
+        , job => $channelName
+        , buildstatus => 0
+        },
+        { rows => 1, order_by => "eval.id desc"
+        , join => { jobsetevalmembers => 'eval' }
+        }
+    );
+
+    notFound($c, "Channel $channelName either doesn't exist ".
+                 "or was never built successfully.")
+        if !$lastSuccessful;
+
+    $c->stash->{lastSuccessful} = $lastSuccessful;
+}
+
+
+sub overview : Chained('channel') PathPart('') Args(0) {
+    my ($self, $c) = @_;
+
+    $c->stash->{constituents} = [
+        $c->stash->{lastSuccessful}->constituents_->search(
+            {}, {order_by => ["job"]}
+        )
+    ];
+
+    $c->stash->{genericChannel} = 0;
+    $c->stash->{template} = 'channel-contents.tt';
+}
+
+
+1;
diff --git a/src/root/channel-contents.tt b/src/root/channel-contents.tt
index b5f3d269..04619903 100644
--- a/src/root/channel-contents.tt
+++ b/src/root/channel-contents.tt
@@ -27,6 +27,7 @@ $ nix-env -u '*'</pre>
 <tt>nix-install-package</tt> program in your web browser, you can
 install the package simply by clicking on the packages below.</p>
 
+[% IF genericChannel %]
 
 <h2>Packages</h2>
 
@@ -69,5 +70,17 @@ install the package simply by clicking on the packages below.</p>
 
 </table>
 
+[% ELSE %]
+[% PROCESS "product-list.tt" %]
+
+<h2>Contents</h2>
+
+[% INCLUDE renderProductList build=lastSuccessful %]
+
+<p>Upgrades depend on the success/failure of the following constituents:</p>
+
+[% INCLUDE renderBuildList builds=constituents %]
+
+[% END %]
 
 [% END %]
diff --git a/src/root/jobset-channels-tab.tt b/src/root/jobset-channels-tab.tt
index 27d1f4cf..c003d70e 100644
--- a/src/root/jobset-channels-tab.tt
+++ b/src/root/jobset-channels-tab.tt
@@ -22,7 +22,7 @@
     <tbody>
       [% FOREACH chan IN channels-%]
         <tr>
-          <th><span>[% INCLUDE renderJobName project=project.name jobset=jobset.name job=chan %]</span></th>
+          <th><span><a href="[% c.uri_for('/channel/custom' project.name jobset.name chan) %]">[% chan %]</a></span></th>
           [% FOREACH eval IN evalIds %]
             <td>[% r = evals.$eval.builds.$chan; IF r.id %]<a href="[% c.uri_for('/build' r.id) %]">[% INCLUDE renderBuildStatusIcon size=16 build=r %]</a>[% END %]</td>
           [% END %]

From 8b4f51f65700f9e8baa8a8e755e8826a4af20980 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 27 Apr 2015 04:55:13 +0200
Subject: [PATCH 14/16] Channel.pm: Actually deliver channel expressions.

So this is the final part which is needed in order to be able to deliver
custom channels, everything else is now just polishing.

We do this by simply redirecting to the build product download URL and
we use binary_cache_url the same way as in NixChannel.pm.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 src/lib/Hydra/Controller/Channel.pm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/src/lib/Hydra/Controller/Channel.pm b/src/lib/Hydra/Controller/Channel.pm
index 033fc4de..902d6019 100644
--- a/src/lib/Hydra/Controller/Channel.pm
+++ b/src/lib/Hydra/Controller/Channel.pm
@@ -54,4 +54,30 @@ sub overview : Chained('channel') PathPart('') Args(0) {
 }
 
 
+sub nixexprs : Chained('channel') PathPart('') Args(1) {
+    my ($self, $c, $productName) = @_;
+
+    my $product = $c->stash->{lastSuccessful}->buildproducts->find(
+        { type => "channel", name => $productName }
+    );
+
+    my $url = $c->uri_for(
+        $c->controller("Build")->action_for("download"),
+        [$c->stash->{lastSuccessful}->id],
+        $product->productnr,
+        $productName
+    );
+
+    $c->res->redirect($url);
+}
+
+
+sub binary_cache_url : Chained('channel') PathPart('binary-cache-url') Args(0) {
+    my ($self, $c) = @_;
+    $c->stash->{'plain'} = { data => $c->uri_for('/') };
+    $c->response->content_type('text/plain');
+    $c->forward('Hydra::View::Plain');
+}
+
+
 1;

From 99cbe06b0d24941fce37a3c3a1f36a1bcd7ea662 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 27 Apr 2015 18:20:21 +0200
Subject: [PATCH 15/16] channel-contents: Fix display of last paragraph.

The last paragraph states about package installation of the "following"
jobs, but it only applies to generic channels, so let's only display it
there.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 src/root/channel-contents.tt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/root/channel-contents.tt b/src/root/channel-contents.tt
index 04619903..4335b328 100644
--- a/src/root/channel-contents.tt
+++ b/src/root/channel-contents.tt
@@ -22,13 +22,13 @@ $ nix-env -i foo</pre>
 $ nix-channel --update
 $ nix-env -u '*'</pre>
 
+[% IF genericChannel %]
+
 <p>Alternatively, if you have associated the
 <tt>application/nix-package</tt> MIME type with the
 <tt>nix-install-package</tt> program in your web browser, you can
 install the package simply by clicking on the packages below.</p>
 
-[% IF genericChannel %]
-
 <h2>Packages</h2>
 
 <p>This channel contains the following packages.</p>

From 92e85f05e2879957ee395ce17428ae965d5e53f4 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 14 Oct 2015 21:37:30 +0200
Subject: [PATCH 16/16] hydra.sql: Make isChannel a not null column.

We have this set in upgrade-42.sql, so it's better to stay consistent
with the basic SQL file to avoid problems with new Hydra installations.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Reported-by: Eelco Dolstra <eelco.dolstra@logicblox.com>
---
 src/sql/hydra.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sql/hydra.sql b/src/sql/hydra.sql
index 2b3414ec..3c0fb1d9 100644
--- a/src/sql/hydra.sql
+++ b/src/sql/hydra.sql
@@ -157,7 +157,7 @@ create table Builds (
     maxsilent     integer default 3600, -- meta.maxsilent
     timeout       integer default 36000, -- meta.timeout
 
-    isChannel     integer default 0, -- meta.isHydraChannel
+    isChannel     integer not null default 0, -- meta.isHydraChannel
     isCurrent     integer default 0,
 
     -- Copy of the nixExprInput/nixExprPath fields of the jobset that