Branch: refs/heads/master
  Home:   https://github.com/NixOS/hydra
  Commit: 19e7114f0ee288057b2e33e3feee25b348645603
      
https://github.com/NixOS/hydra/commit/19e7114f0ee288057b2e33e3feee25b348645603
  Author: aszlig <[email protected]>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M src/root/product-list.tt
    A src/root/static/images/channel.png

  Log Message:
  -----------
  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 <[email protected]>


  Commit: 7b60aed5ed5133e759da3f7f1f9dff2ffd25ddd8
      
https://github.com/NixOS/hydra/commit/7b60aed5ed5133e759da3f7f1f9dff2ffd25ddd8
  Author: aszlig <[email protected]>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M src/lib/Hydra/Controller/Jobset.pm
    A src/root/jobset-channels-tab.tt
    M src/root/jobset.tt

  Log Message:
  -----------
  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 <[email protected]>


  Commit: f6bb8afc300a4eca6b343577db9b343ee87937d2
      
https://github.com/NixOS/hydra/commit/f6bb8afc300a4eca6b343577db9b343ee87937d2
  Author: aszlig <[email protected]>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M src/lib/Hydra/Controller/Build.pm
    M src/root/build.tt

  Log Message:
  -----------
  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 <[email protected]>


  Commit: a235de3ad71a490c82a07e67e8236ab4b20cd51c
      
https://github.com/NixOS/hydra/commit/a235de3ad71a490c82a07e67e8236ab4b20cd51c
  Author: aszlig <[email protected]>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M src/lib/Hydra/Controller/Jobset.pm
    M src/root/product-list.tt

  Log Message:
  -----------
  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 <[email protected]>


  Commit: 06b76ab275caa600f702fdb8e79ea2e312c57a67
      
https://github.com/NixOS/hydra/commit/06b76ab275caa600f702fdb8e79ea2e312c57a67
  Author: aszlig <[email protected]>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M src/hydra-eval-jobs/hydra-eval-jobs.cc
    M src/lib/Hydra/Helper/AddBuilds.pm
    M src/lib/Hydra/Schema/Builds.pm
    M src/sql/hydra.sql
    A src/sql/upgrade-42.sql

  Log Message:
  -----------
  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 <[email protected]>


  Commit: 8f7486cd9c7528c2840585708cc7fa06a3ffd784
      
https://github.com/NixOS/hydra/commit/8f7486cd9c7528c2840585708cc7fa06a3ffd784
  Author: aszlig <[email protected]>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M src/lib/Hydra/Controller/Jobset.pm

  Log Message:
  -----------
  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 <[email protected]>


  Commit: ba7402ed6c75becdf4ff0c59ead582cc3b5d341a
      
https://github.com/NixOS/hydra/commit/ba7402ed6c75becdf4ff0c59ead582cc3b5d341a
  Author: aszlig <[email protected]>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M src/lib/Hydra/Controller/Jobset.pm

  Log Message:
  -----------
  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 <[email protected]>


  Commit: ed361a0145272e8bbbdddb457540be6832c060c4
      
https://github.com/NixOS/hydra/commit/ed361a0145272e8bbbdddb457540be6832c060c4
  Author: aszlig <[email protected]>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M src/lib/Hydra/Controller/Build.pm
    M src/root/build.tt

  Log Message:
  -----------
  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 <[email protected]>


  Commit: 1fdc258de0d7f97af428de34e8be019fca3db251
      
https://github.com/NixOS/hydra/commit/1fdc258de0d7f97af428de34e8be019fca3db251
  Author: aszlig <[email protected]>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M src/lib/Hydra/Base/Controller/ListBuilds.pm

  Log Message:
  -----------
  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 <[email protected]>


  Commit: c9aadd8b7d40bb5c184054253f79406fca9687ec
      
https://github.com/NixOS/hydra/commit/c9aadd8b7d40bb5c184054253f79406fca9687ec
  Author: aszlig <[email protected]>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M src/lib/Hydra/Controller/Jobset.pm
    M src/lib/Hydra/Helper/CatalystUtils.pm
    M src/root/jobset-channels-tab.tt
    M src/root/jobset-jobs-tab.tt

  Log Message:
  -----------
  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 <[email protected]>


  Commit: d1de12cac1eb08ee2c8133a3fe41c53ae7d34cee
      
https://github.com/NixOS/hydra/commit/d1de12cac1eb08ee2c8133a3fe41c53ae7d34cee
  Author: aszlig <[email protected]>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M src/root/product-list.tt

  Log Message:
  -----------
  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 <[email protected]>


  Commit: f1dd08afc8188b5f3304bbd35c0dbe950bbe3816
      
https://github.com/NixOS/hydra/commit/f1dd08afc8188b5f3304bbd35c0dbe950bbe3816
  Author: aszlig <[email protected]>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M src/root/build.tt

  Log Message:
  -----------
  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 <[email protected]>


  Commit: db0ef9e49b54969b8e7fd83d775dd2d74d1eaf43
      
https://github.com/NixOS/hydra/commit/db0ef9e49b54969b8e7fd83d775dd2d74d1eaf43
  Author: aszlig <[email protected]>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M src/lib/Hydra/Base/Controller/NixChannel.pm
    A src/lib/Hydra/Controller/Channel.pm
    M src/root/channel-contents.tt
    M src/root/jobset-channels-tab.tt

  Log Message:
  -----------
  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 <[email protected]>


  Commit: 8b4f51f65700f9e8baa8a8e755e8826a4af20980
      
https://github.com/NixOS/hydra/commit/8b4f51f65700f9e8baa8a8e755e8826a4af20980
  Author: aszlig <[email protected]>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M src/lib/Hydra/Controller/Channel.pm

  Log Message:
  -----------
  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 <[email protected]>


  Commit: 99cbe06b0d24941fce37a3c3a1f36a1bcd7ea662
      
https://github.com/NixOS/hydra/commit/99cbe06b0d24941fce37a3c3a1f36a1bcd7ea662
  Author: aszlig <[email protected]>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M src/root/channel-contents.tt

  Log Message:
  -----------
  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 <[email protected]>


  Commit: 92e85f05e2879957ee395ce17428ae965d5e53f4
      
https://github.com/NixOS/hydra/commit/92e85f05e2879957ee395ce17428ae965d5e53f4
  Author: aszlig <[email protected]>
  Date:   2015-10-14 (Wed, 14 Oct 2015)

  Changed paths:
    M src/sql/hydra.sql

  Log Message:
  -----------
  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 <[email protected]>
Reported-by: Eelco Dolstra <[email protected]>


  Commit: 8ecd84c16063b80d59141dd43d8a5fde81cc82c4
      
https://github.com/NixOS/hydra/commit/8ecd84c16063b80d59141dd43d8a5fde81cc82c4
  Author: dantheho <[email protected]>
  Date:   2015-10-16 (Fri, 16 Oct 2015)

  Changed paths:
    M src/sql/upgrade-41.sql

  Log Message:
  -----------
  Fix schema update for schedulingShares


  Commit: 47593235142c8be99f53f2543e93330338f16f7e
      
https://github.com/NixOS/hydra/commit/47593235142c8be99f53f2543e93330338f16f7e
  Author: Eelco Dolstra <[email protected]>
  Date:   2015-10-16 (Fri, 16 Oct 2015)

  Changed paths:
    M src/sql/upgrade-41.sql

  Log Message:
  -----------
  Tweak


  Commit: 30823078c4b043675f22c77d20833f3b78f7bb9f
      
https://github.com/NixOS/hydra/commit/30823078c4b043675f22c77d20833f3b78f7bb9f
  Author: Eelco Dolstra <[email protected]>
  Date:   2015-10-16 (Fri, 16 Oct 2015)

  Changed paths:
    M src/hydra-eval-jobs/hydra-eval-jobs.cc
    M src/lib/Hydra/Base/Controller/ListBuilds.pm
    M src/lib/Hydra/Base/Controller/NixChannel.pm
    A src/lib/Hydra/Controller/Channel.pm
    M src/lib/Hydra/Controller/Jobset.pm
    M src/lib/Hydra/Helper/AddBuilds.pm
    M src/lib/Hydra/Helper/CatalystUtils.pm
    M src/lib/Hydra/Schema/Builds.pm
    M src/root/build.tt
    M src/root/channel-contents.tt
    A src/root/jobset-channels-tab.tt
    M src/root/jobset-jobs-tab.tt
    M src/root/jobset.tt
    M src/root/product-list.tt
    A src/root/static/images/channel.png
    M src/sql/hydra.sql
    A src/sql/upgrade-42.sql

  Log Message:
  -----------
  Merge branch 'custom-channels' of https://github.com/aszlig/hydra


Compare: https://github.com/NixOS/hydra/compare/7b9f4889491a...30823078c4b0
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to