diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2020-06-09 11:19:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-09 11:19:47 +0200 |
commit | 51e8a82f1e8a6790d940fee17d810007b85b206f (patch) | |
tree | a2912a6f8a6681877399f3e932ca491b479017a9 | |
parent | 29c4fc94cf4958df9717a3a880d8862eef1bf384 (diff) | |
parent | c18016cfbfb16a7a1bf89bd0e99e864f28214903 (diff) | |
download | nixpkgs-51e8a82f1e8a6790d940fee17d810007b85b206f.tar nixpkgs-51e8a82f1e8a6790d940fee17d810007b85b206f.tar.gz nixpkgs-51e8a82f1e8a6790d940fee17d810007b85b206f.tar.bz2 nixpkgs-51e8a82f1e8a6790d940fee17d810007b85b206f.tar.lz nixpkgs-51e8a82f1e8a6790d940fee17d810007b85b206f.tar.xz nixpkgs-51e8a82f1e8a6790d940fee17d810007b85b206f.tar.zst nixpkgs-51e8a82f1e8a6790d940fee17d810007b85b206f.zip |
Merge pull request #89297 from Ma27/bump-hydra
hydra-unstable: 2020-04-16 -> 2020-06-01
-rw-r--r-- | nixos/tests/hydra/db-migration.nix | 6 | ||||
-rw-r--r-- | pkgs/development/tools/misc/hydra/default.nix | 14 |
2 files changed, 14 insertions, 6 deletions
diff --git a/nixos/tests/hydra/db-migration.nix b/nixos/tests/hydra/db-migration.nix index cf74acfd67a..ca65e2e66aa 100644 --- a/nixos/tests/hydra/db-migration.nix +++ b/nixos/tests/hydra/db-migration.nix @@ -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' ) - 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 original.succeed( @@ -69,7 +69,7 @@ with pkgs.lib; ) 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 original.succeed("hydra-backfill-ids") @@ -79,7 +79,7 @@ with pkgs.lib; ) 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 original.wait_until_succeeds( diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index f9a50dd0ea0..fb884c8ffac 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -24,14 +24,22 @@ # so when having an older version, `pkgs.hydra-migration` should be deployed first. hydra-unstable = callPackage ./common.nix { - version = "2020-04-16"; + version = "2020-06-01"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "87837f1d82904bf48e11b5641258b6be2f663c3b"; - sha256 = "1vs3lyfyafsl7wbpmycv7c3n9n2rkrswp65msb6q1iskgpvr96d5"; + rev = "750e2e618ac6d3df02c57a2cf8758bc66a27c40a"; + sha256 = "1szfzf9kw5cj6yn57gfxrffbdkdf8v3xy9914924blpn5qll31g4"; }; nix = nixFlakes; + + patches = [ + (fetchpatch { + url = "https://github.com/NixOS/hydra/commit/d4822a5f4b57dff26bdbf436723a87dd62bbcf30.patch"; + sha256 = "1n6hyjz1hzvka4wi78d4wg0sg2wanrdmizqy23vmp7pmv8s3gz8w"; + }) + ]; + tests = { db-migration = nixosTests.hydra-db-migration.mig; basic = nixosTests.hydra.hydra-unstable; |