jenkins-bot has submitted this change and it was merged.
Change subject: Remove debugging statements related to TMPDIR
......................................................................
Remove debugging statements related to TMPDIR
The temporary directory should now be kept around as owned by
jenkins-deploy user. Remove the various debugging statements I have
introduced recently:
Drop stat calls
rm are no more verbose
Bug: T120824
Change-Id: I2bc48b7e344fdc3653ef9aa245a584ddc2251e08
---
M bin/global-setup.sh
M bin/global-teardown.sh
M bin/mw-selenium-teardown.sh
3 files changed, 3 insertions(+), 9 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/global-setup.sh b/bin/global-setup.sh
index b4b7854..4c77e4d 100755
--- a/bin/global-setup.sh
+++ b/bin/global-setup.sh
@@ -2,9 +2,6 @@
. /srv/deployment/integration/slave-scripts/bin/global-set-env.sh
-stat "$TMPDIR_FS" || :
-stat "$TMPDIR_REGULAR" || :
-
mkdir -p "$TMPDIR_FS"
mkdir -p "$TMPDIR_REGULAR"
diff --git a/bin/global-teardown.sh b/bin/global-teardown.sh
index 329cc9d..5256e7d 100755
--- a/bin/global-teardown.sh
+++ b/bin/global-teardown.sh
@@ -2,9 +2,6 @@
. /srv/deployment/integration/slave-scripts/bin/global-set-env.sh
-stat "${TMPDIR_FS}" || :
-stat "${TMPDIR_REGULAR}" || :
-
# Only delete files, leaving the directory due to a race condition with
# Apache/HHVM threads that might still be running after the job is completed.
# Ends up re creating the directory as owned by www-data which causes
@@ -13,5 +10,5 @@
# Have bash '*' to expand dot files as well
shopt -s dotglob
-rm -v -rf "$TMPDIR_FS"/*
-rm -v -rf "$TMPDIR_REGULAR"/*
+rm -rf "$TMPDIR_FS"/*
+rm -rf "$TMPDIR_REGULAR"/*
diff --git a/bin/mw-selenium-teardown.sh b/bin/mw-selenium-teardown.sh
index 3cde013..57fb835 100755
--- a/bin/mw-selenium-teardown.sh
+++ b/bin/mw-selenium-teardown.sh
@@ -5,4 +5,4 @@
# Have bash '*' to expand dot files as well.
# We keep the directory see bin/global-teardown.sh and T120824
shopt -s dotglob
-rm -v -rf "$TMPDIR"/*
+rm -rf "$TMPDIR"/*
--
To view, visit https://gerrit.wikimedia.org/r/260545
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2bc48b7e344fdc3653ef9aa245a584ddc2251e08
Gerrit-PatchSet: 2
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
