jenkins-bot has submitted this change and it was merged.
Change subject: Added job for WikidataQuality extension.
......................................................................
Added job for WikidataQuality extension.
Change order: Load Wikibase before other extensions.
Align order of qunit job template.
Parametrize Wikibase JJB macros.
Run composer twice, once for WikidataQuality and once for Wikibase.
Bug: T97529
Change-Id: I16825b41f90c735811b5463e122f302b54cf7bd3
---
M jjb/mediawiki-extensions.yaml
M jjb/wikidata.yaml
M zuul/layout.yaml
3 files changed, 76 insertions(+), 16 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index d21652c..62d291a 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -528,7 +528,6 @@
- WikibaseJavaScriptApi
- Wikidata # bug T95897
- WikidataEntitySuggester
- - WikidataQuality
- WikiGrok:
dependencies: 'Echo,MobileFrontend,Mantle,VisualEditor'
- wikihiero:
diff --git a/jjb/wikidata.yaml b/jjb/wikidata.yaml
index c86a1cb..be928d2 100644
--- a/jjb/wikidata.yaml
+++ b/jjb/wikidata.yaml
@@ -3,6 +3,9 @@
builders:
- shell: |
composer=/srv/deployment/integration/composer/vendor/bin/composer
+ if [ "{extension}" != "Wikibase" ]; then
+ cd "$WORKSPACE/src/extensions/Wikibase" && timeout 300 $composer
update --prefer-source -vvv
+ fi
cd "$WORKSPACE/src/extensions/{extension}" && timeout 300
$composer update --prefer-source -vvv
- builder:
@@ -26,7 +29,7 @@
{params}
- job-template:
- name: 'mwext-Wikibase-{kind}-tests-{dbflavor}-{phpflavor}'
+ name: 'mwext-{ext-name}-{kind}-tests-{dbflavor}-{phpflavor}'
node: 'contintLabsSlave && ((UbuntuPrecise && phpflavor-zend &&
phpflavor-{phpflavor}) || (UbuntuTrusty && phpflavor-hhvm &&
phpflavor-{phpflavor}))'
concurrent: true
triggers:
@@ -36,16 +39,16 @@
phpflavor: '{phpflavor}'
- hhvm-clear-hhbc
- zuul-cloner-extdeps:
- ext-name: 'Wikibase'
+ ext-name: '{ext-name}'
dependencies: '{dependencies}'
- wd-mw-composer-install-ext:
- extension: 'Wikibase'
+ extension: '{ext-name}'
- 'mw-install-{dbflavor}'
- shell: "cp deps.txt src/extensions_load.txt"
- - mw-apply-settings
- wd-wikibase-apply-settings:
repoorclient: '{repoorclient}'
experimental: 'true'
+ - mw-apply-settings
- mw-run-update-script
- wd-runtests:
params: '{phpunit-params}'
@@ -56,22 +59,22 @@
- 'mw-teardown-{dbflavor}'
- job-template:
- name: 'mwext-Wikibase-qunit'
+ name: 'mwext-{ext-name}-qunit'
node: contintLabsSlave && UbuntuTrusty
concurrent: true
triggers:
- zuul
builders:
- zuul-cloner-extdeps:
- ext-name: 'Wikibase'
+ ext-name: '{ext-name}'
dependencies: '{dependencies}'
- wd-mw-composer-install-ext:
- extension: 'Wikibase'
+ extension: '{ext-name}'
+ - mw-install-sqlite
+ - shell: "cp deps.txt src/extensions_load.txt"
- wd-wikibase-apply-settings:
repoorclient: 'repo' # qunit tests are in lib so this can be either..
experimental: 'true'
- - mw-install-sqlite
- - shell: "cp deps.txt src/extensions_load.txt"
- mw-apply-settings
- mw-run-update-script
- qunit-karma
@@ -163,7 +166,7 @@
name: 'mwext'
ext-name: 'Wikibase'
- - 'mwext-Wikibase-{kind}-tests-{dbflavor}-{phpflavor}':
+ - 'mwext-{ext-name}-{kind}-tests-{dbflavor}-{phpflavor}':
ext-name: 'Wikibase'
kind: repo
repoorclient: 'repo'
@@ -175,7 +178,7 @@
- zend
- hhvm
phpunit-params: '--group Wikibase,WikibaseAPI,Purtle'
- - 'mwext-Wikibase-{kind}-tests-{dbflavor}-{phpflavor}':
+ - 'mwext-{ext-name}-{kind}-tests-{dbflavor}-{phpflavor}':
ext-name: 'Wikibase'
kind: client
repoorclient: 'client'
@@ -188,7 +191,7 @@
- hhvm
phpunit-params: '--group Wikibase,WikibaseClient'
- - 'mwext-Wikibase-qunit':
+ - 'mwext-{ext-name}-qunit':
ext-name: 'Wikibase'
- 'mwext-Wikidata-{kind}-tests':
@@ -271,3 +274,38 @@
name: wikidata-query-rdf
jobs:
- wikidata-query-rdf
+
+- project:
+ name: WikidataQuality
+ # By default we do not need any other extensions:
+ dependencies: ""
+
+ wrappers:
+ - timeout:
+ timeout: 30
+ fail: true
+ - timestamps
+ - ansicolor
+
+ jobs:
+
+ - '{name}-{ext-name}-npm':
+ name: 'mwext'
+ ext-name: 'WikidataQuality'
+
+ - 'mwext-{ext-name}-{kind}-tests-{dbflavor}-{phpflavor}':
+ ext-name: 'WikidataQuality'
+ kind: repo
+ repoorclient: 'repo'
+ dependencies: 'Wikibase'
+ dbflavor:
+ - mysql
+ - sqlite
+ phpflavor:
+ - zend
+ - hhvm
+ phpunit-params: '--group WikidataQuality'
+
+ - 'mwext-{ext-name}-qunit':
+ ext-name: 'WikidataQuality'
+ dependencies: 'Wikibase'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 14a7cf4..a565af5 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1506,8 +1506,6 @@
voting: false
- name: ^mwext-WikidataEntitySuggester-testextension.*
voting: false
- - name: ^mwext-WikidataQuality-testextension.*
- voting: false
# Requires composer for autoloader
- name: ^mwext-WikivoteMapsYandex-testextension.*
voting: false
@@ -1764,6 +1762,11 @@
- name: ^mwext-FlaggedRevs-testextension.* # bug 61848
# FlaggablePageTest::testPageDataFromTitle triggers an uncommitted
# transaction.
+ voting: false
+ # Fail because of HHVM bug, see T95864
+ - name: mwext-WikidataQuality-repo-tests-sqlite-hhvm
+ voting: false
+ - name: mwext-WikidataQuality-repo-tests-mysql-hhvm
voting: false
- name: operations-puppet-doc
@@ -5729,7 +5732,27 @@
- name: mediawiki/extensions/WikidataQuality
template:
- name: lint-js
- - name: extension-unittests
+ check:
+ - phplint
+ - php-composer-package-validate
+ test:
+ - phplint
+ - php-composer-package-validate
+ - mwext-WikidataQuality-repo-tests-sqlite-zend
+ - mwext-WikidataQuality-repo-tests-mysql-zend
+ - mwext-WikidataQuality-repo-tests-sqlite-hhvm
+ - mwext-WikidataQuality-repo-tests-mysql-hhvm
+ - mwext-WikidataQuality-qunit
+ - mwext-WikidataQuality-npm
+ gate-and-submit:
+ - phplint
+ - php-composer-package-validate
+ - mwext-WikidataQuality-repo-tests-sqlite-zend
+ - mwext-WikidataQuality-repo-tests-mysql-zend
+ - mwext-WikidataQuality-repo-tests-sqlite-hhvm
+ - mwext-WikidataQuality-repo-tests-mysql-hhvm
+ - mwext-WikidataQuality-qunit
+ - mwext-WikidataQuality-npm
- name: mediawiki/extensions/Wikilog
template:
--
To view, visit https://gerrit.wikimedia.org/r/206392
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I16825b41f90c735811b5463e122f302b54cf7bd3
Gerrit-PatchSet: 15
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Soeren.oldag <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: JanZerebecki <[email protected]>
Gerrit-Reviewer: Soeren.oldag <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
