Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226995
Change subject: Add extension-unittests-generic to metrolook
......................................................................
Add extension-unittests-generic to metrolook
Change-Id: Iaa33b2002e898d68fe78f236e225c6e4bac61679
---
M jjb/macro.yaml
M jjb/mediawiki-extensions.yaml
M jjb/ruby-jobs.yaml
M zuul/layout.yaml
4 files changed, 25 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/95/226995/1
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
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 0484c69..e168a20 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2431,6 +2431,7 @@
- name: mediawiki/skins/Metrolook
template:
- name: composer-test
+ - name: extension-unittests-generic
- name: npm
check:
- jsonlint
--
To view, visit https://gerrit.wikimedia.org/r/226995
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa33b2002e898d68fe78f236e225c6e4bac61679
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
