JanZerebecki has uploaded a new change for review.
https://gerrit.wikimedia.org/r/258634
Change subject: Don't leave one of the TMPDIRs around when it is switched
inbetween
......................................................................
Don't leave one of the TMPDIRs around when it is switched inbetween
Bug: T120824
Change-Id: Ib95395ac7aeb423790a2590b624979412d7c4ff1
---
M bin/global-set-env.sh
M bin/global-teardown.sh
2 files changed, 6 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins
refs/changes/34/258634/1
diff --git a/bin/global-set-env.sh b/bin/global-set-env.sh
index 59254fd..7005e03 100755
--- a/bin/global-set-env.sh
+++ b/bin/global-set-env.sh
@@ -7,11 +7,13 @@
# 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.
+export TMPDIR_FS="$HOME/tmpfs/jenkins-${EXECUTOR_NUMBER}"
+export TMPDIR_REGULAR="/tmp/jenkins-${EXECUTOR_NUMBER}"
if [ -d "$HOME/tmpfs" ] && [ -z "${SKIP_TMPFS:-}" ]; then
# All slaves should have tmpfs mounted, use if available
- export TMPDIR="$HOME/tmpfs/jenkins-${EXECUTOR_NUMBER}"
+ export TMPDIR="${TMPDIR_FS}"
else
- export TMPDIR="/tmp/jenkins-${EXECUTOR_NUMBER}"
+ export TMPDIR="${TMPDIR_REGULAR}"
fi
# Integration slaves have an Xvfb window with server number 94 reserved for
diff --git a/bin/global-teardown.sh b/bin/global-teardown.sh
index 0e168ae..76a62ae 100755
--- a/bin/global-teardown.sh
+++ b/bin/global-teardown.sh
@@ -2,4 +2,5 @@
. /srv/deployment/integration/slave-scripts/bin/global-set-env.sh
-rm -rf "$TMPDIR"
+rm -rf "${TMPDIR_FS}"
+rm -rf "${TMPDIR_REGULAR}"
--
To view, visit https://gerrit.wikimedia.org/r/258634
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib95395ac7aeb423790a2590b624979412d7c4ff1
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: JanZerebecki <jan.wikime...@zerebecki.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
