jenkins-bot has submitted this change and it was merged.
Change subject: Create and cleanup TMPDIR for mw-selenium builder
......................................................................
Create and cleanup TMPDIR for mw-selenium builder
The MW-Selenium job is currently working around an unfortunate bug in
Xvfb that forces us to use a directory under /tmp as the TMPDIR.
See Iaf3287cfb3fe897de6fb4c4b79784a5e7ef900a8
Bug: T103039
Change-Id: Ib289d784c7b3985bd4823d967fbc07d5759dc756
---
M jjb/macro.yaml
M jjb/mediawiki-extensions.yaml
M jjb/ruby-jobs.yaml
3 files changed, 24 insertions(+), 1 deletion(-)
Approvals:
Dduvall: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index dd3cd01..f0816ed 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -377,12 +377,15 @@
#
# - tests-dir: Parent of the `features` directory. Usually `tests/browser`.
#
+# ALWAYS pair with 'localhost-cleanup'
+# ALWAYS pair with 'mw-selenium-cleanup'
+#
- builder:
name: mw-selenium-with-dir
builders:
- prepare-localhost
- bundle-with-options:
- initialization:
'/srv/deployment/integration/slave-scripts/bin/mw-set-env-mw-selenium.sh'
+ initialization:
'/srv/deployment/integration/slave-scripts/bin/mw-selenium-teardown.sh'
command: |
cucumber --color --tags @integration --tags ~@skip --format pretty \
--format junit --out $WORKSPACE/log/junit
@@ -393,12 +396,30 @@
# the MW extension directory. Note that EXT_NAME is set by
# zuul/ext_dependencies.py
#
+# ALWAYS pair with 'localhost-cleanup'
+# ALWAYS pair with 'mw-selenium-cleanup'
+#
- builder:
name: mw-selenium
builders:
- mw-selenium-with-dir:
tests-dir: 'src/extensions/$EXT_NAME/tests/browser'
+# Cleans up anything left under /tmp/jenkins-$EXECUTOR_NUMBER
+#
+# Note that once the bug with Xvfb and TMPDIR is resolved, this can be
+# removed. See the bin/mw-set-env-mw-selenium.sh slave script for details.
+#
+- publisher:
+ name: mw-selenium-cleanup
+ publishers:
+ - postbuildscript:
+ builders:
+ - shell:
'/srv/deployment/integration/slave-scripts/bin/mw-selenium-teardown.sh'
+ # Postbuild options are confusing, setting both to false ensures the
script always runs.
+ onsuccess: False
+ onfailure: False
+
# - src: (without trailing slash)
# - project: (usually repo name or a custom title like "VisualEditor") - will
be escaped
# - version: (usually branch name) - will be escaped
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index b9ce732..7ea3290 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -200,6 +200,7 @@
projects: mediawiki/skins/Vector
- mw-selenium
publishers:
+ - mw-selenium-cleanup
- localhost-cleanup
- mw-teardown-mysql
- archive-log-dir
diff --git a/jjb/ruby-jobs.yaml b/jjb/ruby-jobs.yaml
index aad06d3..a692290 100644
--- a/jjb/ruby-jobs.yaml
+++ b/jjb/ruby-jobs.yaml
@@ -157,6 +157,7 @@
- mw-selenium-with-dir:
tests-dir: '.'
publishers:
+ - mw-selenium-cleanup
- localhost-cleanup
- mw-teardown-mysql
- archive-log-dir
--
To view, visit https://gerrit.wikimedia.org/r/224179
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib289d784c7b3985bd4823d967fbc07d5759dc756
Gerrit-PatchSet: 5
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Dduvall <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Zfilipin <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
