Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/70642


Change subject: ExtraSettings.php sets tmpfs to Jenkins user homedir
......................................................................

ExtraSettings.php sets tmpfs to Jenkins user homedir

The hardcoded /var/lib/jenkins does not work whenever the job is being
triggered on a slave which uses 'jenkins-slave' as a username and has
the tmpfs mounted at /var/lib/jenkins-slave/tmpfs .

ant script need to be updated as well.

Change-Id: I0f48feb4cf7106ac53a8ae628e421cb81d5c67d7
---
M jobs/_shared/ExtraSettings.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins 
refs/changes/42/70642/1

diff --git a/jobs/_shared/ExtraSettings.php b/jobs/_shared/ExtraSettings.php
index 802a94c..5009745 100644
--- a/jobs/_shared/ExtraSettings.php
+++ b/jobs/_shared/ExtraSettings.php
@@ -10,7 +10,8 @@
 
 // gallium.wikimedia.org has tmpfs installed, use that instead of
 // the default /tmp.
-$jenkinsTmpFs = '/var/lib/jenkins/tmpfs';
+$jenkinsUserHome = getenv('HOME') ?: '/var/lib/jenkins';
+$jenkinsTmpFs = "{$jenkinsUserHome}/tmpfs";
 $jenkinsJobName = getenv( 'JOB_NAME' );
 if ( $jenkinsJobName && is_dir( "$jenkinsTmpFs/$jenkinsJobName" ) ) {
        $wgTmpDirectory = "$jenkinsTmpFs/$jenkinsJobName";

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f48feb4cf7106ac53a8ae628e421cb81d5c67d7
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to