jenkins-bot has submitted this change and it was merged.
Change subject: Mediawiki core/vendor PHPUnit jobs to Nodepool
......................................................................
Mediawiki core/vendor PHPUnit jobs to Nodepool
trigger (hhvm, trusty) and (php55, trusty)
hhvm on jessie is only on the experimental pipeline.
parsertests are still in standalone jobs.
Adjust regex that applies branch filtering.
Keep old jobs for easy revert.
Create:
mediawiki-phpunit-hhvm-jessie
mediawiki-phpunit-hhvm-trusty
mediawiki-phpunit-php55-trusty
mediawiki-parsertests-hhvm-jessie
mediawiki-parsertests-hhvm-trusty
mediawiki-parsertests-php55-trusty
Bug: T135001
Bug: T119139
Change-Id: I3a2342562c4bf37d043ff7d3af5428d27ce6c6f6
---
M jjb/mediawiki.yaml
M zuul/layout.yaml
2 files changed, 87 insertions(+), 17 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 512b9cf..d8de168 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -135,6 +135,62 @@
- mw-teardown-mysql
- archive-log-dir
+# Runs all MediaWiki tests under hhvm on Nodepool instances
+- job-template:
+ name: 'mediawiki-phpunit-{phpflavor}-{image}'
+ node: ci-{image}-wikimedia
+ concurrent: true
+ properties:
+ - zeromq-event
+ triggers:
+ - zuul
+ builders:
+ - castor-load
+ - assert-phpflavor:
+ phpflavor: '{phpflavor}'
+ - hhvm-clear-hhbc
+ - zuul-cloner:
+ projects: >
+ mediawiki/core
+ mediawiki/vendor
+ - mw-install-mysql
+ - mw-apply-settings
+ - mw-fetch-composer-dev
+ # ParserTests tests are run via 'mediawiki-phpunit-parsertests-phpflavor'
+ - shell: "PHPUNIT_EXCLUDE_GROUP=ParserTests
/srv/deployment/integration/slave-scripts/bin/mw-phpunit.sh"
+ publishers:
+ - phpunit-junit-2
+ - archive-log-dir
+ - castor-save
+
+# Only runs the 'parsertests' MediaWiki test suite on Nodepool instances
+# Complements 'mediawiki-phpunit-{phpflavor}-{image}'
+- job-template:
+ name: 'mediawiki-parsertests-{phpflavor}-{image}'
+ node: ci-{image}-wikimedia
+ concurrent: true
+ properties:
+ - zeromq-event
+ triggers:
+ - zuul
+ builders:
+ - castor-load
+ - assert-phpflavor:
+ phpflavor: '{phpflavor}'
+ - hhvm-clear-hhbc
+ - zuul-cloner:
+ projects: >
+ mediawiki/core
+ mediawiki/vendor
+ - mw-install-mysql
+ - mw-apply-settings
+ - mw-fetch-composer-dev
+ - shell: "PHPUNIT_TESTSUITE=parsertests
/srv/deployment/integration/slave-scripts/bin/mw-phpunit.sh"
+ publishers:
+ - phpunit-junit-2
+ - archive-log-dir
+ - castor-save
+
# Runs subset of MediaWiki tests
#
# Excludes '@group ParserTests' tests which are run in parallel via
@@ -341,6 +397,17 @@
- '{name}-php55lint'
- 'mediawiki-phpunit-{phpflavor}'
- 'mediawiki-phpunit-parsertests-{phpflavor}'
+ - 'mediawiki-phpunit-{phpflavor}-{image}': &phpflavor_images
+ phpflavor:
+ - php55:
+ image: trusty
+ # Wikimedia runs HHVM on Trusty and will move to Jessie
+ - hhvm:
+ image: trusty
+ - hhvm:
+ image: jessie
+ - 'mediawiki-parsertests-{phpflavor}-{image}': *phpflavor_images
+
- 'mediawiki-phpunit-{phpflavor}-composer'
- 'mediawiki-extensions-{phpflavor}':
dependencies: &gatedextensions >
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index e2e2aa2..c6b26af 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -667,7 +667,7 @@
# Release branch 1.23 does not support composer, hhvm variant is done by
the next filter
branch: (?!REL1_23)
- - name: ^mediawiki.*-hhvm(-composer)?$
+ - name: ^mediawiki.*-hhvm(-composer)?(-trusty|-jessie)?$
# Release branches do not support hhvm.
branch: (?!REL1_23|REL1_24|fundraising/REL.*)
@@ -840,7 +840,7 @@
- name: mediawiki-core-doxygen-publish
branch: ^(master|REL.*|refs/tags/(?!wmf).*)$ # REL is bug 50325
- - name: mediawiki-phpunit-hhvm
+ - name: mediawiki-phpunit-hhvm-trusty
queue-name: mediawiki
- name: mediawiki-phpunit-php53
queue-name: mediawiki
@@ -1278,14 +1278,14 @@
- mediawiki-core-npm-node-4.3
- mediawiki-core-php53lint
- mediawiki-core-php55lint
- - mediawiki-phpunit-hhvm
- - mediawiki-phpunit-parsertests-hhvm
+ - mediawiki-phpunit-hhvm-trusty
+ - mediawiki-parsertests-hhvm-trusty
- mediawiki-core-qunit
- composer-package-validate
php5:
# Comment "check php5" to manually run this
- mediawiki-phpunit-php55
- - mediawiki-phpunit-parsertests-php55
+ - mediawiki-parsertests-php55-trusty
- mediawiki-phpunit-php53
- mediawiki-phpunit-parsertests-php53
gate-and-submit:
@@ -1294,13 +1294,13 @@
- mediawiki-core-php53lint
- mediawiki-core-php55lint
- mediawiki-core-phpcs-trusty
- - mediawiki-phpunit-hhvm
- - mediawiki-phpunit-parsertests-hhvm
+ - mediawiki-phpunit-hhvm-trusty
+ - mediawiki-parsertests-hhvm-trusty
- mediawiki-phpunit-hhvm-composer
- mediawiki-phpunit-php53
- mediawiki-phpunit-parsertests-php53
- - mediawiki-phpunit-php55
- - mediawiki-phpunit-parsertests-php55
+ - mediawiki-phpunit-php55-trusty
+ - mediawiki-parsertests-php55-trusty
- mediawiki-core-qunit
- composer-package-validate
postmerge:
@@ -1313,6 +1313,9 @@
- mediawiki-phpunit-hhvm-composer
# will replace mediawiki-phpunit-php53 for branches not using vendor,
currently not used as the composer part is covered by the hhvm variant
- mediawiki-phpunit-php53-composer
+ # For when we switch WMF app servers to Jessie
+ - mediawiki-phpunit-hhvm-jessie
+ - mediawiki-parsertests-hhvm-jessie
- name: mediawiki/debian
experimental:
@@ -1334,20 +1337,20 @@
- php55lint
- composer-validate
- mediawiki-core-qunit
- - mediawiki-phpunit-hhvm
- - mediawiki-phpunit-parsertests-hhvm
+ - mediawiki-phpunit-hhvm-trusty
+ - mediawiki-parsertests-hhvm-trusty
php5:
- - mediawiki-phpunit-php55
- - mediawiki-phpunit-parsertests-php55
+ - mediawiki-phpunit-php55-trusty
+ - mediawiki-parsertests-php55-trusty
- mediawiki-phpunit-php53
- mediawiki-phpunit-parsertests-php53
gate-and-submit:
- php53lint
- php55lint
- - mediawiki-phpunit-hhvm
- - mediawiki-phpunit-parsertests-hhvm
- - mediawiki-phpunit-php55
- - mediawiki-phpunit-parsertests-php55
+ - mediawiki-phpunit-hhvm-trusty
+ - mediawiki-parsertests-hhvm-trusty
+ - mediawiki-phpunit-php55-trusty
+ - mediawiki-parsertests-php55-trusty
- mediawiki-phpunit-php53
- mediawiki-phpunit-parsertests-php53
- mediawiki-core-qunit
--
To view, visit https://gerrit.wikimedia.org/r/286497
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3a2342562c4bf37d043ff7d3af5428d27ce6c6f6
Gerrit-PatchSet: 9
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
