jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/338121 )
Change subject: Wikibase jobs to Nodepool
......................................................................
Wikibase jobs to Nodepool
Tested via the experimental pipeline and they work! Promote the jobs out
of experimental pipeline.
Remove the versions that runs on permanent slaves:
mwext-Wikibase-client-tests-mysql-hhvm
mwext-Wikibase-client-tests-mysql-php55
mwext-Wikibase-client-tests-sqlite-hhvm
mwext-Wikibase-client-tests-sqlite-php55
mwext-Wikibase-repo-tests-sqlite-hhvm
mwext-Wikibase-repo-tests-sqlite-php55
Add castor to the template and refresh the Nodepool flavors:
mwext-Wikibase-client-tests-mysql-hhvm-jessie
mwext-Wikibase-client-tests-mysql-php55-trusty
mwext-Wikibase-client-tests-sqlite-hhvm-jessie
mwext-Wikibase-client-tests-sqlite-php55-trusty
mwext-Wikibase-repo-tests-sqlite-hhvm-jessie
mwext-Wikibase-repo-tests-sqlite-php55-trusty
Change-Id: Ia9cccf1970241d87e3caf9601e34edf10ff89aca
---
M jjb/wikidata.yaml
M zuul/layout.yaml
2 files changed, 17 insertions(+), 55 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/wikidata.yaml b/jjb/wikidata.yaml
index 3d319dc..19eb421 100644
--- a/jjb/wikidata.yaml
+++ b/jjb/wikidata.yaml
@@ -22,9 +22,9 @@
--log-junit "$WORKSPACE/log/junit-wikidata.xml" \
{params}
-- job-template: &wikibase-tests-template
- name: 'mwext-Wikibase-{kind}-tests-{dbflavor}-{phpflavor}'
- node: 'contintLabsSlave && phpflavor-{phpflavor}'
+- job-template:
+ name: 'mwext-Wikibase-{kind}-tests-{dbflavor}-{phpflavor}-{image}'
+ node: ci-{image}-wikimedia
concurrent: true
triggers:
- zuul
@@ -36,6 +36,7 @@
- assert-phpflavor:
phpflavor: '{phpflavor}'
- hhvm-clear-hhbc
+ - castor-load
- zuul-cloner-extdeps:
dependencies: 'Wikibase,{dependencies}'
- wd-mw-composer-merged-install
@@ -49,19 +50,11 @@
- wd-runtests:
params: '{phpunit-params}'
publishers:
+ - castor-save
- archive-log-dir
- junit:
results: 'log/junit*.xml'
- 'mw-teardown-{dbflavor}'
-
-# XXX miss castor :(
-- job-template:
- !!merge : *wikibase-tests-template
- name: 'mwext-Wikibase-{kind}-tests-{dbflavor}-{phpflavor}-{image}'
- node: ci-{image}-wikimedia
- # Reinject Zuul parameters since JJB strip them for some reason
- triggers:
- - zuul
- project:
name: wikidata
@@ -76,19 +69,6 @@
- ansicolor
jobs:
-
- # repo
- - 'mwext-Wikibase-{kind}-tests-{dbflavor}-{phpflavor}':
- kind: repo
- repoorclient: 'repo'
- dependencies: 'CirrusSearch,Elastica,GeoData,cldr'
- dbflavor:
- - sqlite
- phpflavor:
- - php55
- - hhvm
- phpunit-params: '--group Wikibase,WikibaseAPI,Purtle'
-
# repo on Nodepool
- 'mwext-Wikibase-{kind}-tests-{dbflavor}-{phpflavor}-{image}':
kind: repo
@@ -103,18 +83,6 @@
image: jessie
phpunit-params: '--group Wikibase,WikibaseAPI,Purtle'
- # client
- - 'mwext-Wikibase-{kind}-tests-{dbflavor}-{phpflavor}':
- kind: client
- repoorclient: 'client'
- dependencies: 'Scribunto,Capiunto,cldr,Echo'
- dbflavor:
- - mysql
- - sqlite
- phpflavor:
- - php55
- - hhvm
- phpunit-params: '--group Wikibase,WikibaseClient'
# client on Nodepool
- 'mwext-Wikibase-{kind}-tests-{dbflavor}-{phpflavor}-{image}':
kind: client
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 0841e07..4f638a3 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -8707,30 +8707,24 @@
- jshint
- jsonlint
php5: # 'check php5'
- - mwext-Wikibase-repo-tests-sqlite-php55
- - mwext-Wikibase-client-tests-mysql-php55
- - mwext-Wikibase-client-tests-sqlite-php55
+ - mwext-Wikibase-repo-tests-sqlite-php55-trusty
+ - mwext-Wikibase-client-tests-mysql-php55-trusty
+ - mwext-Wikibase-client-tests-sqlite-php55-trusty
test:
- mwext-mw-selenium-composer-jessie
- - mwext-Wikibase-repo-tests-sqlite-hhvm
- - mwext-Wikibase-client-tests-mysql-hhvm
- - mwext-Wikibase-client-tests-sqlite-hhvm
+ - mwext-Wikibase-repo-tests-sqlite-hhvm-jessie
+ - mwext-Wikibase-client-tests-mysql-hhvm-jessie
+ - mwext-Wikibase-client-tests-sqlite-hhvm-jessie
gate-and-submit:
- mwext-mw-selenium-composer-jessie
- - mwext-Wikibase-repo-tests-sqlite-php55
- - mwext-Wikibase-repo-tests-sqlite-hhvm
- - mwext-Wikibase-client-tests-mysql-php55
- - mwext-Wikibase-client-tests-sqlite-php55
- - mwext-Wikibase-client-tests-mysql-hhvm
- - mwext-Wikibase-client-tests-sqlite-hhvm
+ - mwext-Wikibase-repo-tests-sqlite-php55-trusty
+ - mwext-Wikibase-repo-tests-sqlite-hhvm-jessie
+ - mwext-Wikibase-client-tests-mysql-php55-trusty
+ - mwext-Wikibase-client-tests-sqlite-php55-trusty
+ - mwext-Wikibase-client-tests-mysql-hhvm-jessie
+ - mwext-Wikibase-client-tests-sqlite-hhvm-jessie
experimental:
- mwext-php70-phan-jessie
- - mwext-Wikibase-client-tests-mysql-hhvm-jessie
- - mwext-Wikibase-client-tests-mysql-php55-trusty
- - mwext-Wikibase-client-tests-sqlite-hhvm-jessie
- - mwext-Wikibase-client-tests-sqlite-php55-trusty
- - mwext-Wikibase-repo-tests-sqlite-hhvm-jessie
- - mwext-Wikibase-repo-tests-sqlite-php55-trusty
postmerge:
- mwext-doxygen-publish
- mwext-jsduck-publish
--
To view, visit https://gerrit.wikimedia.org/r/338121
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia9cccf1970241d87e3caf9601e34edf10ff89aca
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
