Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/216132
Change subject: Common job for extensions that runs qunit
......................................................................
Common job for extensions that runs qunit
Same as mediawiki-extensions-{phpflavor} but runs qunit instead.
Intended to be triggered by multiple extensions.
Factored out:
- injection of extension when triggered via the experimental
pipeline.
- sorting of deps.txt
Creates: mediawiki-extensions-qunit
Bug: T99877
Change-Id: I099d81b0fd20eca907081fdaa2b99240124acaa7
---
M jjb/mediawiki.yaml
M zuul/layout.yaml
2 files changed, 63 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/32/216132/1
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 21ebe51..99fc89a 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -180,6 +180,31 @@
- mw-teardown-mysql
- archive-log-dir
+- builder:
+ name: inject-experimental-extension
+ builders:
+ - shell: |
+ # When triggered from the experimental pipeline, add the project to
+ # the list of dependencies. Used to inject an extension which is not
+ # yet part of the list above.
+ if [ "$ZUUL_PIPELINE" == 'experimental' ] && ! grep -q
"$ZUUL_PROJECT" deps.txt; then
+ echo "$ZUUL_PROJECT" >> deps.txt
+ # Evil copy paste of `zuul-cloner` macro
+ # FIXME maybe we should always pass $ZUUL_PROJECT in the macro
+ zuul-cloner --color --verbose \
+ --map
/srv/deployment/integration/slave-scripts/etc/zuul-clonemap.yaml \
+ --workspace src \
+ https://gerrit.wikimedia.org/r/p \
+ "$ZUUL_PROJECT"
+ fi
+
+- builder:
+ name: sort-deps-txt
+ builders:
+ - shell: |
+ # Ensure consitent loading
+ sort -o deps.txt deps.txt
+
# See 'mediawiki-phpunit-{phpflavor}'
- job-template:
name: 'mediawiki-extensions-{phpflavor}'
@@ -197,22 +222,8 @@
- zuul-cloner-extdeps:
ext-name: ''
dependencies: '{dependencies}'
- - shell: |
- # When triggered from the experimental pipeline, add the project to
- # the list of dependencies. Used to inject an extension which is not
- # yet part of the list above.
- if [ "$ZUUL_PIPELINE" == 'experimental' ] && ! grep -q
"$ZUUL_PROJECT" deps.txt; then
- echo "$ZUUL_PROJECT" >> deps.txt
- # Evil copy paste of `zuul-cloner` macro
- # FIXME maybe we should always pass $ZUUL_PROJECT in the macro
- zuul-cloner --color --verbose \
- --map
/srv/deployment/integration/slave-scripts/etc/zuul-clonemap.yaml \
- --workspace src \
- https://gerrit.wikimedia.org/r/p \
- "$ZUUL_PROJECT"
- fi
- # Ensure consitent loading
- sort -o deps.txt deps.txt
+ - inject-experimental-extension
+ - sort-deps-txt
- mw-install-mysql
- shell: "cp deps.txt src/extensions_load.txt"
- mw-apply-settings
@@ -225,6 +236,32 @@
- mw-teardown-mysql
- archive-log-dir
+# See 'mediawiki-phpunit-{phpflavor}'
+- job-template:
+ name: 'mediawiki-extensions-qunit'
+ node: contintLabsSlave && UbuntuTrusty
+ concurrent: true
+ logrotate:
+ daysToKeep: 15
+
+ triggers:
+ - zuul
+ builders:
+ - zuul-cloner-extdeps:
+ ext-name: ''
+ dependencies: '{dependencies}'
+ - inject-experimental-extension
+ - sort-deps-txt
+ - mw-install-mysql
+ - shell: "cp deps.txt src/extensions_load.txt"
+ - mw-apply-settings
+ - mw-run-update-script
+ - qunit-karma
+ #- shell: "/srv/deployment/integration/slave-scripts/bin/mw-run-phpunit.sh"
+ publishers:
+ - qunit-cleanup
+ - mw-teardown-mysql
+ - archive-log-dir
# Test out our PHPUnit against various MediaWiki branches
#
@@ -313,7 +350,7 @@
- 'mediawiki-phpunit-{phpflavor}'
- 'mediawiki-phpunit-{phpflavor}-composer'
- 'mediawiki-extensions-{phpflavor}':
- dependencies: |
+ dependencies: &gatedextensions |
AbuseFilter
Babel
CheckUser
@@ -336,6 +373,8 @@
WikiGrok
ZeroBanner
ZeroPortal
+ - 'mediawiki-extensions-qunit':
+ dependencies: *gatedextensions
- job:
name: 'mediawiki-core-code-coverage'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 2243174..2b564f9 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -583,6 +583,7 @@
# TODO stop triggering zend jobs for the wmf branches
# Extensions tested together, since 1.25alpha ...
+ # TODO might want to filter mediawiki-extensions-qunit as well
- name: ^mediawiki-extensions-(hhvm|zend)$
branch: (?!REL1_23|REL1_24|fundraising/REL.*)
queue-name: mediawiki
@@ -1775,6 +1776,7 @@
- php-composer-validate
experimental:
- 'mediawiki-extensions-hhvm'
+ - mediawiki-extensions-qunit
- 'mwext-{name}-testextension-hhvm'
- mwext-testextension-hhvm
- npm
@@ -1797,6 +1799,7 @@
- php-composer-validate
experimental:
- mediawiki-extensions-hhvm
+ - mediawiki-extensions-qunit
- mwext-testextension-hhvm
- npm
- php-composer-test
@@ -1815,9 +1818,11 @@
test:
- mediawiki-extensions-hhvm
- mediawiki-extensions-zend
+ - mediawiki-extensions-qunit
gate-and-submit:
- mediawiki-extensions-hhvm
- mediawiki-extensions-zend
+ - mediawiki-extensions-qunit
# Template for MediaWiki extensions.
# Triggers qunit jobs
@@ -3097,6 +3102,7 @@
- php-composer-validate
experimental:
- mediawiki-extensions-hhvm
+ - mediawiki-extensions-qunit
- name: mediawiki/extensions/cldr
template:
@@ -6787,6 +6793,7 @@
- php-composer-validate
experimental:
- mediawiki-extensions-hhvm
+ - mediawiki-extensions-qunit
- name: mediawiki/extensions/WebPlatformAuth
template:
--
To view, visit https://gerrit.wikimedia.org/r/216132
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I099d81b0fd20eca907081fdaa2b99240124acaa7
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
