Merge #2018

2018: nix fixes + edgeNode test fixes. r=jbgi a=jbgi



Co-authored-by: Jean-Baptiste Giraudeau <jean-baptiste.giraudeau@iohk.io>

default.nix

@@ -24,9 +24,9 @@ let
 
   scripts = callPackage ./nix/scripts.nix { inherit customConfig; };
   # NixOS tests run a proxy and validate it listens
-  nixosTests = import ./nix/nixos/tests {
+  nixosTests = recRecurseIntoAttrs (import ./nix/nixos/tests {
     inherit pkgs;
-  };
+  });
 
   dockerImage = let
     defaultConfig = rec {

nix/haskell.nix

@@ -26,7 +26,7 @@ let
   projectPackages = lib.attrNames (haskell-nix.haskellLib.selectProjectPackages
     (haskell-nix.cabalProject {
       inherit src;
-      compiler-nix-name = "ghc8102";
+      compiler-nix-name = compiler;
     }));
 
   # This creates the Haskell package set.
@@ -64,18 +64,23 @@ let
           lib.mkForce [buildPackages.jq buildPackages.coreutils buildPackages.shellcheck];
       }
       {
-        # Stamp executables with the git revision
-        # And make sure that libsodium DLLs are available for windows binaries:
+        # make sure that libsodium DLLs are available for windows binaries:
         packages = lib.genAttrs projectPackages (name: {
-            postInstall = ''
-              if [ -d $out/bin ]; then
-                ${setGitRev}
-                ${lib.optionalString stdenv.hostPlatform.isWindows
-                  "ln -s ${libsodium}/bin/libsodium-23.dll $out/bin/libsodium-23.dll"
-                }
-              fi
-            '';
-          });
+          postInstall = lib.optionalString stdenv.hostPlatform.isWindows ''
+            if [ -d $out/bin ]; then
+              ${setLibSodium}
+            fi
+          '';
+        });
+      }
+      {
+        # Stamp executables with the git revision
+        packages = lib.genAttrs ["cardano-node" "cardano-cli"] (name: {
+          components.exes.${name}.postInstall = ''
+            ${lib.optionalString stdenv.hostPlatform.isWindows setLibSodium}
+            ${setGitRev}
+          '';
+        });
       }
       ({ pkgs, config, ... }: {
         # Packages we wish to ignore version bounds of.
@@ -153,9 +158,9 @@ let
   # setGitRev is a postInstall script to stamp executables with
   # version info. It uses the "gitrev" argument, if set. Otherwise,
   # the revision is sourced from the local git work tree.
-  setGitRev = ''
-    ${haskellBuildUtils}/bin/set-git-rev "${gitrev'}" $out/bin/* || true
-  '';
+  setGitRev = ''${haskellBuildUtils}/bin/set-git-rev "${gitrev'}" $out/bin/*'';
+  # package with libsodium:
+  setLibSodium = "ln -s ${libsodium}/bin/libsodium-23.dll $out/bin/libsodium-23.dll";
   gitrev' = if (gitrev == null)
     then buildPackages.commonLib.commitIdFromGitRepoOrZero ../.git
     else gitrev;

nix/nixos/tests/cardano-node-edge.nix

@@ -3,25 +3,47 @@ with pkgs;
 {
   name = "cardano-node-edge-test";
   nodes = {
-    machine = { config, pkgs, ... }: {
-      nixpkgs.overlays = commonLib.overlays;
+    machine = { config, ... }: {
+      nixpkgs.pkgs = pkgs;
       imports = [
         ../.
       ];
       services.cardano-node = {
         enable = true;
+        systemdSocketActivation = true;
         port = 3001;
-        inherit (commonLib.environments.staging) genesisFile genesisHash;
-        topology = commonLib.mkEdgeTopology {};
+        hostAddr = "127.0.0.1";
+        environment = "mainnet";
+        cardanoNodePkgs = pkgs;
+        nodeConfig = config.services.cardano-node.environments.${config.services.cardano-node.environment}.nodeConfig // {
+          hasPrometheus = [ config.services.cardano-node.hostAddr 12798 ];
+          # Use Journald output:
+          setupScribes = [{
+            scKind = "JournalSK";
+            scName = "cardano";
+            scFormat = "ScText";
+          }];
+          defaultScribes = [
+            [
+              "JournalSK"
+              "cardano"
+            ]
+          ];
+        };
       };
+      systemd.services.cardano-node.serviceConfig.Restart = lib.mkForce "no";
     };
   };
   testScript = ''
-    startAll
-    $machine->waitForUnit("cardano-node.service");
-    $machine->waitForOpenPort(3001);
-    $machine->succeed("stat /run/cardano-node");
-    $machine->succeed("stat /run/cardano-node/node-core-0.socket");
+    start_all()
+    machine.wait_for_unit("cardano-node.service")
+    machine.sleep(5)
+    machine.succeed("systemctl status cardano-node")
+    machine.succeed("stat /run/cardano-node")
+    machine.succeed("stat /run/cardano-node/node.socket")
+    machine.sleep(15)
+    machine.succeed("nc -z 127.0.0.1 12798")
+    machine.succeed("nc -z 127.0.0.1 3001")
   '';
 
 }

nix/nixos/tests/default.nix

@@ -9,15 +9,12 @@ with pkgs.commonLib;
   forAllSystems = genAttrs supportedSystems;
   importTest = fn: args: system: let
     imported = import fn;
-    test = import (pkgs.path + "/nixos/tests/make-test.nix") imported;
+    test = import (pkgs.path + "/nixos/tests/make-test-python.nix") imported;
   in test ({
     inherit pkgs system config;
   } // args);
   callTest = fn: args: forAllSystems (system: hydraJob (importTest fn args system));
 in rec {
   # only tests that port is open since the test can't access network to actually sync
-  # cardanoNodeEdge  = callTest ./cardano-node-edge.nix {};
-
-  # Subsumes what cardanoNodeEdge does
-  chairmansCluster = callTest ./chairmans-cluster.nix {};
+  cardanoNodeEdge  = callTest ./cardano-node-edge.nix {};
 }

nix/scripts.nix

@@ -10,6 +10,7 @@ let
   };
   systemdCompat.options = {
     systemd.services = mkOption {};
+    systemd.sockets = lib.mkOption {};
     assertions = [];
     users = mkOption {};
   };

nix/supervisord-cluster/default.nix

@@ -39,6 +39,7 @@ let
   mkStartScript = envConfig: let
     systemdCompat.options = {
       systemd.services = lib.mkOption {};
+      systemd.sockets = lib.mkOption {};
       users = lib.mkOption {};
       assertions = lib.mkOption {};
     };

nix/supervisord-cluster/hfc/default.nix

@@ -14,6 +14,7 @@ let
   mkStartScript = envConfig: let
     systemdCompat.options = {
       systemd.services = lib.mkOption {};
+      systemd.sockets = lib.mkOption {};
       users = lib.mkOption {};
       assertions = lib.mkOption {};
     };

nix/svclib.nix

@@ -260,6 +260,7 @@ let
     };
     systemdCompat.options = {
       systemd.services = mkOption {};
+      systemd.sockets = lib.mkOption {};
       assertions = [];
       users = mkOption {};
     };

release.nix

@@ -77,8 +77,6 @@ let
     };
   };
   extraBuilds = {
-    # only build nixos tests on first supported system (linux)
-    inherit (pkgsFor (builtins.head  supportedSystems));
     # Environments listed in Network Configuration page
     cardano-deployment = pkgs.iohkNix.cardanoLib.mkConfigHtml { inherit (pkgs.iohkNix.cardanoLib.environments) mainnet testnet; };
   } // (builtins.listToAttrs (map makeRelease [
@@ -155,6 +153,7 @@ let
     };
   }) // extraBuilds // (mkRequiredJob (concatLists [
       (collectJobs jobs.native.checks)
+      (collectJobs jobs.native.nixosTests)
       (collectJobs jobs.native.benchmarks)
       (collectJobs jobs.native.exes)
       (optional windowsBuild jobs.cardano-node-win64)