Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266041
Change subject: Split mediawiki-phpunit-hhvm job to separate parsertests job
......................................................................
Split mediawiki-phpunit-hhvm job to separate parsertests job
To match the PHP53 one.
Change-Id: If134e44e46d304557f683bf7273d6ffd2065161f
---
M jjb/mediawiki.yaml
M zuul/layout.yaml
2 files changed, 19 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/41/266041/1
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index e9f624f..cc39c66 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -142,13 +142,13 @@
- mw-teardown-mysql
- archive-log-dir
-# Runs subset of MediaWiki tests under PHP 5.3
+# Runs subset of MediaWiki tests
#
# Excludes '@group ParserTests' tests which are run in parallel via
-# mediawiki-phpunit-parsertests-php53
+# mediawiki-phpunit-parsertests-{phpflavor}
- job-template:
- name: 'mediawiki-phpunit-php53'
- node: 'contintLabsSlave && UbuntuPrecise && phpflavor-php53'
+ name: 'mediawiki-phpunit-{phpflavor}'
+ node: 'contintLabsSlave && phpflavor-{phpflavor}'
concurrent: true
properties:
- throttle-one-per-node
@@ -156,7 +156,7 @@
- zuul
builders:
- assert-phpflavor:
- phpflavor: 'php53'
+ phpflavor: '{phpflavor}'
- hhvm-clear-hhbc
- zuul-cloner:
projects: >
@@ -164,20 +164,20 @@
mediawiki/vendor
- mw-install-mysql
- mw-apply-settings
- # ParserTests tests are run via 'mediawiki-phpunit-parsertests-php53'
+ # 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
- mw-teardown-mysql
- archive-log-dir
-# mediawiki-phpunit-parsertests-php53
+# mediawiki-phpunit-parsertests-{phpflavor}
#
# Only runs the 'parsertests' MediaWiki testsuite.
-# Complements 'mediawiki-phpunit-parsertests-php53'.
+# Complements 'mediawiki-phpunit-{phpflavor}'.
- job-template:
- name: 'mediawiki-phpunit-parsertests-php53'
- node: 'contintLabsSlave && UbuntuPrecise && phpflavor-php53'
+ name: 'mediawiki-phpunit-parsertests-{phpflavor}'
+ node: 'contintLabsSlave && phpflavor-{phpflavor}'
concurrent: true
properties:
- throttle-one-per-node
@@ -185,7 +185,7 @@
- zuul
builders:
- assert-phpflavor:
- phpflavor: 'php53'
+ phpflavor: '{phpflavor}'
- hhvm-clear-hhbc
- zuul-cloner:
projects: >
@@ -204,7 +204,7 @@
# wmf/ branches will use mediawiki/vendor. See T90303.
- job-template:
name: 'mediawiki-phpunit-{phpflavor}-composer'
- node: 'contintLabsSlave && (UbuntuPrecise && phpflavor-php53 &&
phpflavor-{phpflavor}) || (UbuntuTrusty && phpflavor-hhvm &&
phpflavor-{phpflavor})'
+ node: 'contintLabsSlave && phpflavor-{phpflavor}'
concurrent: true
properties:
- throttle-one-per-node
@@ -269,7 +269,7 @@
# search for 'Restrict where this project can be run', below the input box
# is a text: Slaves in [label]: X . Clicking [label] will list nodes
# matching the expression.
- node: 'contintLabsSlave && (UbuntuPrecise && phpflavor-php53 &&
phpflavor-{phpflavor}) || (UbuntuTrusty && phpflavor-hhvm &&
phpflavor-{phpflavor})'
+ node: 'contintLabsSlave && phpflavor-{phpflavor}'
concurrent: true
logrotate:
daysToKeep: 15
@@ -369,9 +369,8 @@
- 'mediawiki-core-doxygen-publish'
- mediawiki-gate
- '{name}-php53lint'
- - 'mediawiki-phpunit-hhvm'
- - 'mediawiki-phpunit-php53'
- - 'mediawiki-phpunit-parsertests-php53'
+ - 'mediawiki-phpunit-{phpflavor}'
+ - 'mediawiki-phpunit-parsertests-{phpflavor}'
- 'mediawiki-phpunit-{phpflavor}-composer'
- 'mediawiki-extensions-{phpflavor}':
dependencies: &gatedextensions |
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index f195a7e..66fe955 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1521,6 +1521,7 @@
- mediawiki-core-npm
- mediawiki-core-php53lint
- mediawiki-phpunit-hhvm
+ - mediawiki-phpunit-parsertests-hhvm
#- mediawiki-phpunit-php53 (disabled, slow, Icac172b16)
- mediawiki-core-qunit
- php-composer-package-validate
@@ -1535,6 +1536,7 @@
- mediawiki-core-php53lint
- mediawiki-core-phpcs
- mediawiki-phpunit-hhvm
+ - mediawiki-phpunit-parsertests-hhvm
- mediawiki-phpunit-hhvm-composer
- mediawiki-phpunit-php53
- mediawiki-phpunit-parsertests-php53
@@ -1566,12 +1568,14 @@
- php-composer-validate
- mediawiki-core-qunit
- mediawiki-phpunit-hhvm
+ - mediawiki-phpunit-parsertests-hhvm
php53:
- mediawiki-phpunit-php53
- mediawiki-phpunit-parsertests-php53
gate-and-submit:
- php53lint
- mediawiki-phpunit-hhvm
+ - mediawiki-phpunit-parsertests-hhvm
- mediawiki-phpunit-php53
- mediawiki-phpunit-parsertests-php53
- mediawiki-core-qunit
--
To view, visit https://gerrit.wikimedia.org/r/266041
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If134e44e46d304557f683bf7273d6ffd2065161f
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
