sts-sponsors team mailing list archive

[Björn Tillenius <mp+436180@xxxxxxxxxxxxxxxxxx>]

Björn Tillenius has proposed merging ~bjornt/maas:bug-1990172-3.3 into maas:3.3.

Commit message:
LP #1990172: "20-maas-03-machine-resources" commissioning script improperly reports a Pass when the test fails

The results was piped to 'tee', but pipefail wasn't set.

(cherry picked from commit 15f64a96a59ef39cde0bbb06b79948e05e03c147)



Requested reviews:
  Björn Tillenius (bjornt)

For more details, see:
https://code.launchpad.net/~bjornt/maas/+git/maas/+merge/436180
-- 
Your team MAAS Committers is subscribed to branch maas:3.3.

diff --git a/src/provisioningserver/refresh/20-maas-03-machine-resources b/src/provisioningserver/refresh/20-maas-03-machine-resources
index ae9d282..c86821c 100755
--- a/src/provisioningserver/refresh/20-maas-03-machine-resources
+++ b/src/provisioningserver/refresh/20-maas-03-machine-resources
@@ -25,6 +25,8 @@
 # timeout: 60
 # --- End MAAS 1.0 script metadata ---
 
+set -o pipefail
+
 declare -A ARCH_MAP=(
     [aarch64]=arm64
     [i686]=i386