Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200323
Change subject: Also run mwext-Wikibase-*-tests jobs under MySQL
......................................................................
Also run mwext-Wikibase-*-tests jobs under MySQL
Bug: T94208
Change-Id: I83f290707dddf9d09dadcd9237f7ad24349ee5ca
---
M jjb/macro.yaml
M jjb/wikidata.yaml
M zuul/layout.yaml
3 files changed, 37 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/23/200323/1
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index c527140..57b1c3e 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -415,7 +415,7 @@
builders:
- shell: "/srv/deployment/integration/slave-scripts/bin/mw-setup.sh"
-# ALWAYS pair with 'mw-teardown' publisher to ensure we don't leave temporary
files behind
+# ALWAYS pair with 'mw-teardown-sqlite' publisher to ensure we don't leave
temporary files behind
- builder:
name: mw-install-sqlite
builders:
@@ -438,6 +438,15 @@
onfailure: False
- publisher:
+ name: mw-teardown-sqlite
+ publishers:
+ - postbuildscript:
+ builders:
+ - shell:
"/srv/deployment/integration/slave-scripts/bin/mw-teardown.sh"
+ onsuccess: False
+ onfailure: False
+
+- publisher:
name: mw-teardown-mysql
publishers:
- postbuildscript:
diff --git a/jjb/wikidata.yaml b/jjb/wikidata.yaml
index bc5b58f..8e29637 100644
--- a/jjb/wikidata.yaml
+++ b/jjb/wikidata.yaml
@@ -26,7 +26,7 @@
{params}
- job-template:
- name: 'mwext-Wikibase-{kind}-tests'
+ name: 'mwext-Wikibase-{kind}-tests-{dbflavor}'
node: contintLabsSlave && UbuntuPrecise
concurrent: true
triggers:
@@ -37,7 +37,7 @@
dependencies: '{dependencies}'
- wd-mw-composer-install-ext:
extension: 'Wikibase'
- - mw-install-sqlite
+ - 'mw-install-{dbflavor}'
- shell: "cp deps.txt src/extensions_load.txt"
- mw-apply-settings
- wd-wikibase-apply-settings:
@@ -50,7 +50,7 @@
- archive-log-dir
- junit:
results: 'log/junit*.xml'
- - mw-teardown
+ - 'mw-teardown-{dbflavor}'
- job-template:
name: 'mwext-Wikibase-qunit'
@@ -142,25 +142,34 @@
name: 'mwext'
ext-name: 'Wikibase'
- - 'mwext-Wikibase-{kind}-tests':
+ - 'mwext-Wikibase-{kind}-tests-{dbflavor}':
ext-name: 'Wikibase'
kind: repo
repoorclient: 'repo'
dependencies: 'cldr'
+ dbflavor:
+ - mysql
+ - sqlite
phpunit-params: '--group Wikibase --exclude-group WikibaseAPI'
- - 'mwext-Wikibase-{kind}-tests':
+ - 'mwext-Wikibase-{kind}-tests-{dbflavor}':
ext-name: 'Wikibase'
kind: repo-api
repoorclient: 'repo'
dependencies: 'cldr'
+ dbflavor:
+ - mysql
+ - sqlite
phpunit-params: '--group WikibaseAPI,Purtle'
- - 'mwext-Wikibase-{kind}-tests':
+ - 'mwext-Wikibase-{kind}-tests-{dbflavor}':
ext-name: 'Wikibase'
kind: client
repoorclient: 'client'
dependencies: 'Scribunto,cldr'
+ dbflavor:
+ - mysql
+ - sqlite
phpunit-params: '--group Wikibase,WikibaseClient'
- 'mwext-Wikibase-qunit':
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 36a8064..15ee7a1 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -6887,17 +6887,23 @@
test:
- phplint
- php-composer-validate
- - mwext-Wikibase-repo-tests
- - mwext-Wikibase-repo-api-tests
- - mwext-Wikibase-client-tests
+ - mwext-Wikibase-repo-tests-mysql
+ - mwext-Wikibase-repo-tests-sqlite
+ - mwext-Wikibase-repo-api-tests-mysql
+ - mwext-Wikibase-repo-api-tests-sqlite
+ - mwext-Wikibase-client-tests-mysql
+ - mwext-Wikibase-client-tests-sqlite
- mwext-Wikibase-qunit
- mwext-Wikibase-npm
gate-and-submit:
- phplint
- php-composer-validate
- - mwext-Wikibase-repo-tests
- - mwext-Wikibase-repo-api-tests
- - mwext-Wikibase-client-tests
+ - mwext-Wikibase-repo-tests-mysql
+ - mwext-Wikibase-repo-tests-sqlite
+ - mwext-Wikibase-repo-api-tests-mysql
+ - mwext-Wikibase-repo-api-tests-sqlite
+ - mwext-Wikibase-client-tests-mysql
+ - mwext-Wikibase-client-tests-sqlite
- mwext-Wikibase-qunit
- mwext-Wikibase-npm
--
To view, visit https://gerrit.wikimedia.org/r/200323
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I83f290707dddf9d09dadcd9237f7ad24349ee5ca
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
