Merge branch 'main' into fix_chain_id

crypto-org-chain · Jul 24, 2024 · 18a5f35 · 18a5f35
2 parents d24dd87 + 983a5a6
commit 18a5f35
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/nix/testground-image.nix b/nix/testground-image.nix
@@ -1,17 +1,23 @@
-{ dockerTools, cronos-matrix, testground-testcase }:
+{ dockerTools, runCommandLocal, cronos-matrix, testground-testcase }:
 let
  patched-cronosd = cronos-matrix.cronosd.overrideAttrs (oldAttrs: {
  patches = oldAttrs.patches or [ ] ++ [
  ./testground-cronosd.patch
  ];
  });
 in
+let
+ tmpDir = runCommandLocal "tmp" { } ''
+ mkdir -p $out/tmp/
+ '';
+in
 dockerTools.buildLayeredImage {
  name = "cronos-testground";
  created = "now";
  contents = [
  testground-testcase
  patched-cronosd
+ tmpDir
  ];
  config = {
  Expose = [ 9090 26657 26656 1317 26658 26660 26659 30000 ];

diff --git a/testground/benchmark/compositions/docker-compose.jsonnet b/testground/benchmark/compositions/docker-compose.jsonnet
@@ -6,7 +6,6 @@ std.manifestYamlDoc({
  container_name: 'testplan-' + i,
  volumes: [
  @'${DATADIR:-/tmp/data/out}:/data',
- '/tmp:/tmp',
  ],
  environment: {
  JOB_COMPLETION_INDEX: i,