jenkins-bot has submitted this change and it was merged.
Change subject: Create both possible TMPDIR so they belong to jenkins-deploy
......................................................................
Create both possible TMPDIR so they belong to jenkins-deploy
Don't leave one of the TMPDIRs around when it is switched inbetween. The
mwext-mw-selenium job has SKIP_TMPFS which set TMPDIR differently from
what has been configured in MediaWiki. Hence when hitting MediaWiki via
Apache, the LocalisationCache creates a tmp dir that belongs to
www-data. That cause the teardown to fail due to permission denial.
Create both possible temp directory so they belong to jenkins-deploy.
Bug: T120824
Change-Id: Ib95395ac7aeb423790a2590b624979412d7c4ff1
---
M bin/global-set-env.sh
M bin/global-setup.sh
M bin/global-teardown.sh
M bin/mw-selenium-setup.sh
4 files changed, 13 insertions(+), 6 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 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-setup.sh b/bin/global-setup.sh
index c35804d..4c77e4d 100755
--- a/bin/global-setup.sh
+++ b/bin/global-setup.sh
@@ -2,5 +2,8 @@
. /srv/deployment/integration/slave-scripts/bin/global-set-env.sh
-mkdir -p "$TMPDIR"
-chmod 777 "$TMPDIR"
+mkdir -p "$TMPDIR_FS"
+mkdir -p "$TMPDIR_REGULAR"
+
+chmod 777 "$TMPDIR_FS"
+chmod 777 "$TMPDIR_REGULAR"
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}"
diff --git a/bin/mw-selenium-setup.sh b/bin/mw-selenium-setup.sh
index 4b72708..30d3be5 100755
--- a/bin/mw-selenium-setup.sh
+++ b/bin/mw-selenium-setup.sh
@@ -2,7 +2,8 @@
. /srv/deployment/integration/slave-scripts/bin/mw-set-env-mw-selenium.sh
-mkdir -p "$TMPDIR"
+mkdir -p "$TMPDIR_FS"
+mkdir -p "$TMPDIR_REGULAR"
# Append the MW installation's LocalSettings.php with the contents of
# tests/browser/LocalSettings.php. Note that this setup script requires that
--
To view, visit https://gerrit.wikimedia.org/r/258634
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib95395ac7aeb423790a2590b624979412d7c4ff1
Gerrit-PatchSet: 3
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: JanZerebecki <[email protected]>
Gerrit-Reviewer: DCausse <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: KartikMistry <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
