Skip to content

Commit

Permalink
hydra: Prevent caching of shelley integration test failures
Browse files Browse the repository at this point in the history
Causes integration tests to be re-run whenever the git revision
changes, even if everything else is identical. Since these tests tend
to fail a lot, we don't want to cache false failures.

Also increase the minimum severity for integration test logging,
because debug level produces quite a lot of output.
  • Loading branch information
rvl authored and KtorZ committed Jul 10, 2020
1 parent 749c243 commit 48ff3d8
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
2 changes: 1 addition & 1 deletion default.nix
Expand Up @@ -70,7 +70,7 @@ let
buildHaskellPackages = args: import ./nix/haskell.nix ({
inherit config lib stdenv pkgs buildPackages;
inherit (pkgs) haskell-nix;
inherit src pr;
inherit src pr gitrev;
} // args);
haskellPackages = buildHaskellPackages {};
profiledHaskellPackages = buildHaskellPackages { profiling = true; };
Expand Down
15 changes: 11 additions & 4 deletions nix/haskell.nix
Expand Up @@ -13,13 +13,13 @@
, src
# GitHub PR number (when building on Hydra)
, pr ? null
# Git revision of sources
, gitrev ? null
}:

let
haskell = pkgs.haskell-nix;
jmPkgs = pkgs.jmPkgs;
# commonLib = (import ./default.nix {}).commonLib; # option a - shorter
inherit (import ./default.nix {}) commonLib; # option b - even shorter

# our packages
stack-pkgs = import ./.stack.nix/default.nix;
Expand Down Expand Up @@ -100,8 +100,15 @@ let
integration.preCheck = lib.optionalString stdenv.isDarwin ''
export TMPDIR=/tmp
'' + ''
export CARDANO_WALLET_TRACING_MIN_SEVERITY=debug
export CARDANO_NODE_TRACING_MIN_SEVERITY=info
# Variables picked up by integration tests
export CARDANO_WALLET_TRACING_MIN_SEVERITY=info
export CARDANO_NODE_TRACING_MIN_SEVERITY=notice
# Causes integration tests to be re-run whenever the git revision
# changes, even if everything else is identical.
# Since these tests tend to fail a lot, we don't want
# to cache false failures.
echo "Git revision is ${toString gitrev}"
'';

# provide cardano-node & cardano-cli to tests
Expand Down

0 comments on commit 48ff3d8

Please sign in to comment.