jenkins-bot has submitted this change and it was merged. Change subject: Change tmpfs to /srv instead of /mnt ......................................................................
Change tmpfs to /srv instead of /mnt Moving out of /mnt in favor of /srv thus the tmpfs mount point change as well. We have a tmpfs on gallium as jenkins-slave, so we still need to vary based on $HOME. Simply translate ^/mnt to ^/srv, leaving other kind of patches unchanged (eg: /var/lib/jenkins-slave). Bug: T146381 Change-Id: I387558a1f213199cd557842915a54c853a0da11d --- M bin/global-set-env.sh 1 file changed, 11 insertions(+), 2 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/bin/global-set-env.sh b/bin/global-set-env.sh index 5955979..bf1d8d3 100755 --- a/bin/global-set-env.sh +++ b/bin/global-set-env.sh @@ -7,9 +7,18 @@ # 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}" + +# About $HOME +# ----------- +# +# jenkins-slave (on prod) uses /var/lib/jenkins-slave +# +# jenkins-deploy has its home set to /mnt/home/jenkins-deploy in LDAP but we +# are moving to /srv T146381 hence we need to translate /mnt to /srv which is +# done with some bash magic. +export TMPDIR_FS="${HOME/#\/mnt//srv}/tmpfs/jenkins-${EXECUTOR_NUMBER}" export TMPDIR_REGULAR="/tmp/jenkins-${EXECUTOR_NUMBER}" -if [ -d "$HOME/tmpfs" ] && [ -z "${SKIP_TMPFS:-}" ]; then +if [ -d "${HOME/#\/mnt//srv}/tmpfs" ] && [ -z "${SKIP_TMPFS:-}" ]; then # All slaves should have tmpfs mounted, use if available export TMPDIR="${TMPDIR_FS}" else -- To view, visit https://gerrit.wikimedia.org/r/312330 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I387558a1f213199cd557842915a54c853a0da11d Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins Gerrit-Branch: master Gerrit-Owner: Hashar <has...@free.fr> Gerrit-Reviewer: Hashar <has...@free.fr> Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits