From fca94da78a636307bb8bb612fff8ac9a94996be8 Mon Sep 17 00:00:00 2001 From: "Roland C. Dowdeswell" Date: Tue, 24 May 2022 09:45:01 +0100 Subject: [PATCH] Revert "chain-initiator.sh: piping to head loses error status" This reverts commit 9e9517c02a2c0c05cec80dabfdb4f0d3f2701653. Turns out that because pipefail is set, that this commit is incorrect. I did issues w.r.t. this in testing, but must have been on a branch or perhaps an older image with a different /bin/sh as I can't reproduce them any more. --- charts/tezos/scripts/chain-initiator.sh | 2 +- test/charts/private-chain.expect.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tezos/scripts/chain-initiator.sh b/charts/tezos/scripts/chain-initiator.sh index 925b62560..d7a071b7e 100644 --- a/charts/tezos/scripts/chain-initiator.sh +++ b/charts/tezos/scripts/chain-initiator.sh @@ -17,4 +17,4 @@ $CLIENT -d /var/tezos/client --block \ {{ .Values.activation.protocol_hash }} \ with fitness -1 and key \ $( cat /etc/tezos/activation_account_name ) \ - and parameters /etc/tezos/parameters.json + and parameters /etc/tezos/parameters.json 2>&1 | head -200 diff --git a/test/charts/private-chain.expect.yaml b/test/charts/private-chain.expect.yaml index 767ac54bc..4dfa171e0 100644 --- a/test/charts/private-chain.expect.yaml +++ b/test/charts/private-chain.expect.yaml @@ -1276,7 +1276,7 @@ spec: Psithaca2MLRFYargivpo7YvUr7wUDqyxrdhC5CQq78mRvimz6A \ with fitness -1 and key \ $( cat /etc/tezos/activation_account_name ) \ - and parameters /etc/tezos/parameters.json + and parameters /etc/tezos/parameters.json 2>&1 | head -200 envFrom: env: