Buildkite: Straighten out environment variables

cardano-foundation · Oct 21, 2021 · ce4877b · ce4877b
1 parent 71026ea
commit ce4877b
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/.buildkite/nightly.yml b/.buildkite/nightly.yml
@@ -1,6 +1,18 @@
 env:
-  NIX_PATH: "channel:nixos-20.09"
+  LC_ALL: "en_US.UTF-8"
+  NIX_PATH: "channel:nixos-21.05"
+
+  # Per-container variables
   SCRATCH_DIR: "/scratch/cardano-wallet"
+  BUILD_DIR: "/build/cardano-wallet"
+  STACK_ROOT: "/build/cardano-wallet.stack"
+  CABAL_DIR: "/build/cardano-wallet.cabal"
+  XDG_STATE_HOME: "/build/cardano-wallet/.state"
+  XDG_CACHE_HOME: "/build/cardano-wallet/.cache"
+  TESTS_LOGDIR: "/build/cardano-wallet/integration-test-logs"
+
+  # Per-host variables - shared across containers on host
+  CACHE_DIR: "/cache/cardano-wallet"
 
 steps:
   - label: 'Restore benchmark - cardano mainnet'

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -1,9 +1,18 @@
 env:
+  LC_ALL: "en_US.UTF-8"
+  NIX_PATH: "channel:nixos-21.05"
+
+  # Per-container variables
+  SCRATCH_DIR: "/scratch/cardano-wallet"
   BUILD_DIR: "/build/cardano-wallet"
   STACK_ROOT: "/build/cardano-wallet.stack"
+  CABAL_DIR: "/build/cardano-wallet.cabal"
+  XDG_STATE_HOME: "/build/cardano-wallet/.state"
+  XDG_CACHE_HOME: "/build/cardano-wallet/.cache"
+  TESTS_LOGDIR: "/build/cardano-wallet/integration-test-logs"
+
+  # Per-host variables - shared across containers on host
   CACHE_DIR: "/cache/cardano-wallet"
-  LC_ALL: "en_US.UTF-8"
-  TESTS_LOGDIR: "/tmp/wallet-integration-logs"
 
 steps:
   - label: 'Prevent merging to wrong branch'
@@ -16,7 +25,7 @@ steps:
 
   - label: 'Stack Rebuild'
     command:
-      - "rm -rf $TESTS_LOGDIR && mkdir $TESTS_LOGDIR"
+      - "rm -rf $TESTS_LOGDIR && mkdir -p $TESTS_LOGDIR"
       - "nix-build .buildkite/default.nix -o sr"
       - "./sr/bin/rebuild --build-dir=$BUILD_DIR --cache-dir=$CACHE_DIR"
     timeout_in_minutes: 120