jenkins-bot has submitted this change and it was merged.

Change subject: Use EXECUTOR_NUMBER instead of BUILD_TAG in TMPDIR
......................................................................


Use EXECUTOR_NUMBER instead of BUILD_TAG in TMPDIR

Because.. UNIX socket paths can't be longer than 100 characters.

Follows-up bb2bf9e, which broke this by including BUILD_TAG
which added the substring "jenkins" and pushed it over the edge.

Bug: T93330
Change-Id: Ibb89790fbdd011ca84c08ee412ffd1576de93e17
---
M bin/mw-set-env.sh
1 file changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Krinkle: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/bin/mw-set-env.sh b/bin/mw-set-env.sh
index efacd89..9f94ebc 100755
--- a/bin/mw-set-env.sh
+++ b/bin/mw-set-env.sh
@@ -18,7 +18,9 @@
 # All slaves should have tmpfs mounted, use if available
 if [ -d "$HOME/tmpfs" ]; then
        # Don't use JOB_NAME since that is not unique when running concurrent 
builds (T91070).
-       export TMPDIR="$HOME/tmpfs/$BUILD_TAG"
+       # Don't use a path longer than 55 characters in total. Chromium needs 
45 characters
+       # for its user-data directory and socket. 103 is the Unix maxlength for 
socket paths (T93330).
+       export TMPDIR="$HOME/tmpfs/jenkins-${EXECUTOR_NUMBER}"
        export MW_TMPDIR="$TMPDIR"
 else
        export MW_TMPDIR="$WORKSPACE/data"

-- 
To view, visit https://gerrit.wikimedia.org/r/198197
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb89790fbdd011ca84c08ee412ffd1576de93e17
Gerrit-PatchSet: 3
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to