jenkins-bot has submitted this change and it was merged.
Change subject: Fix SKIP_TMPFS conditional
......................................................................
Fix SKIP_TMPFS conditional
The previous fix to the "unbound variable" error introduced incorrect
logic for checking the SKIP_TMPFS flag.
Change-Id: I723a82d02e670dda5c667e1384e0359adcb5a27a
Follows-up: I6906fadede546ce2205797da1c6b267aed586e17
---
M bin/global-set-env.sh
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Dduvall: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/global-set-env.sh b/bin/global-set-env.sh
index fccacd5..59254fd 100755
--- a/bin/global-set-env.sh
+++ b/bin/global-set-env.sh
@@ -7,7 +7,7 @@
# Dependent scripts/builders that have issues related to tmpfs, or a non-root
# temporary filesystem, can set `SKIP_TMPFS` to keep keep the temporary
# directory under /tmp.
-if [ -d "$HOME/tmpfs" ] && [ "${SKIP_TMPFS:-0}" != "0" ]; then
+if [ -d "$HOME/tmpfs" ] && [ -z "${SKIP_TMPFS:-}" ]; then
# All slaves should have tmpfs mounted, use if available
export TMPDIR="$HOME/tmpfs/jenkins-${EXECUTOR_NUMBER}"
else
--
To view, visit https://gerrit.wikimedia.org/r/227593
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I723a82d02e670dda5c667e1384e0359adcb5a27a
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Dduvall <dduv...@wikimedia.org>
Gerrit-Reviewer: Dduvall <dduv...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
