Merge pull request #6302 from IntersectMBO/bench-master

bench: fixes

Author: mgmeier

nix/workbench/backend/nomad.nix

@@ -166,9 +166,9 @@ let
       };
       tx-generator = rec {
         # Local reference only used if not "cloud".
-        nix-store-path = pkgs.cardanoNodePackages.tx-generator;
+        nix-store-path = pkgs.cardanoNodePackages.tx-generator.passthru.noGitRev;
         flake-reference = "github:intersectmbo/cardano-node";
-        flake-output = "cardanoNodePackages.tx-generator";
+        flake-output = "cardanoNodePackages.tx-generator.passthru.noGitRev";
       };
     }
   ;

nix/workbench/backend/nomad/cloud.nix

@@ -25,7 +25,7 @@ let
         else (import ./patch.nix {})
       )
       # Amazon S3 HTTP to upload/download the genesis tar file.
-      pkgs.awscli
+      pkgs.awscli2
       # Used to download the logs.
       pkgs.rsync
     ]

nix/workbench/service/generator.nix

@@ -57,6 +57,9 @@ let
         ;
       } // optionalAttrs profile.node.tracer {
         tracerSocketPath = "../tracer/tracer.socket";
+      } // optionalAttrs (!backend.useCabalRun) {
+        # Use to `noGitRev` to avoid rebuilding on every commit.
+        executable     = "${pkgs.cardanoNodePackages.tx-generator.passthru.noGitRev}/bin/tx-generator";
       } // optionalAttrs backend.useCabalRun {
         executable     = "tx-generator";
       });