suzanne.soy/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

hydra-unstable: 2020-04-16 -> 2020-06-01

Browse Source
This commit is contained in:
Maximilian Bosch 2020-06-01 12:42:39 +02:00
parent 99b5c0bcbe
commit c18016cfbf
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/tests/hydra/db-migration.nix
View File

@ -61,7 +61,7 @@ with pkgs.lib;
'curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" | jq .buildstatus | xargs test 0 -eq' 'curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" | jq .buildstatus | xargs test 0 -eq'
) )
out = original.succeed("su -l postgres -c 'psql -d hydra <<< \"\\d+ jobs\" -A'") out = original.succeed("su -l postgres -c 'psql -d hydra <<< \"\\d+ builds\" -A'")
assert "jobset_id" not in out assert "jobset_id" not in out
original.succeed( original.succeed(
@ -69,7 +69,7 @@ with pkgs.lib;
) )
original.wait_for_unit("hydra-init.service") original.wait_for_unit("hydra-init.service")
out = original.succeed("su -l postgres -c 'psql -d hydra <<< \"\\d+ jobs\" -A'") out = original.succeed("su -l postgres -c 'psql -d hydra <<< \"\\d+ builds\" -A'")
assert "jobset_id|integer|||" in out assert "jobset_id|integer|||" in out
original.succeed("hydra-backfill-ids") original.succeed("hydra-backfill-ids")
@ -79,7 +79,7 @@ with pkgs.lib;
) )
original.wait_for_unit("hydra-init.service") original.wait_for_unit("hydra-init.service")
out = original.succeed("su -l postgres -c 'psql -d hydra <<< \"\\d+ jobs\" -A'") out = original.succeed("su -l postgres -c 'psql -d hydra <<< \"\\d+ builds\" -A'")
assert "jobset_id|integer||not null|" in out assert "jobset_id|integer||not null|" in out
original.wait_until_succeeds( original.wait_until_succeeds(

14
pkgs/development/tools/misc/hydra/default.nix
View File

@ -24,14 +24,22 @@
# so when having an older version, `pkgs.hydra-migration` should be deployed first. # so when having an older version, `pkgs.hydra-migration` should be deployed first.
hydra-unstable = callPackage ./common.nix { hydra-unstable = callPackage ./common.nix {
version = "2020-04-16"; version = "2020-06-01";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = "hydra"; repo = "hydra";
rev = "87837f1d82904bf48e11b5641258b6be2f663c3b"; rev = "750e2e618ac6d3df02c57a2cf8758bc66a27c40a";
sha256 = "1vs3lyfyafsl7wbpmycv7c3n9n2rkrswp65msb6q1iskgpvr96d5"; sha256 = "1szfzf9kw5cj6yn57gfxrffbdkdf8v3xy9914924blpn5qll31g4";
}; };
nix = nixFlakes; nix = nixFlakes;
patches = [
(fetchpatch {
url = "https://github.com/NixOS/hydra/commit/d4822a5f4b57dff26bdbf436723a87dd62bbcf30.patch";
sha256 = "1n6hyjz1hzvka4wi78d4wg0sg2wanrdmizqy23vmp7pmv8s3gz8w";
})
];
tests = { tests = {
db-migration = nixosTests.hydra-db-migration.mig; db-migration = nixosTests.hydra-db-migration.mig;
basic = nixosTests.hydra.hydra-unstable; basic = nixosTests.hydra.hydra-unstable;