[MediaWiki-commits] [Gerrit] integration/config[master]: mediawiki: Merge parsertests job back into main phpunit job

2016-09-14 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: mediawiki: Merge parsertests job back into main phpunit job
..


mediawiki: Merge parsertests job back into main phpunit job

This was originally separated because the parser tests were too slow.
Since recent refactoring they are much much faster. By accident, the
refactor also broke --exclude-group=ParserTests (fixed in I8131c3b13).
This meant that for the past week we've already been running parser tests
in the main phpunit jobs as well. And still, it wasn't the slowest job.

Change-Id: Ic2934746be68c06c1fc747e93f4fa73200eba652
---
M jjb/mediawiki.yaml
M zuul/layout.yaml
2 files changed, 4 insertions(+), 81 deletions(-)

Approvals:
  Krinkle: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 1342e29..033b930 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -105,7 +105,7 @@
 publishers:
  - mw-teardown
 
-# Runs all MediaWiki tests under hhvm on Nodepool instances
+# Runs all MediaWiki PHPUnit tests on Nodepool
 - job-template:
 name: 'mediawiki-phpunit-{phpflavor}-{image}'
 node: ci-{image}-wikimedia
@@ -124,43 +124,13 @@
  - 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"
+ - shell: "/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
-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
-# mediawiki-phpunit-parsertests-{phpflavor}
+# Runs all MediaWiki PHPUnit tests on a CI slave
 - job-template:
 name: 'mediawiki-phpunit-{phpflavor}'
 node: 'contintLabsSlave && phpflavor-{phpflavor}'
@@ -180,37 +150,7 @@
  - 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
- - mw-teardown-mysql
- - archive-log-dir
-
-# mediawiki-phpunit-parsertests-{phpflavor}
-#
-# Only runs the 'parsertests' MediaWiki testsuite.
-# Complements 'mediawiki-phpunit-{phpflavor}'.
-- job-template:
-name: 'mediawiki-phpunit-parsertests-{phpflavor}'
-node: 'contintLabsSlave && phpflavor-{phpflavor}'
-concurrent: true
-properties:
- - throttle-one-per-node
-triggers:
- - zuul
-builders:
- - 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"
+ - shell: "/srv/deployment/integration/slave-scripts/bin/mw-phpunit.sh"
 publishers:
  - phpunit-junit-2
  - mw-teardown-mysql
@@ -361,9 +301,6 @@
   - 'mediawiki-phpunit-{phpflavor}':
   phpflavor:
   - php53
-  - 'mediawiki-phpunit-parsertests-{phpflavor}':
-  phpflavor:
-  - php53
   - 'mediawiki-phpunit-{phpflavor}-{image}': _images
   phpflavor:
   - php55:
@@ -373,7 +310,6 @@
   image: trusty
   - hhvm:
   image: jessie
-  - 'mediawiki-parsertests-{phpflavor}-{image}': *phpflavor_images
 
   - 'mediawiki-phpunit-{phpflavor}-composer'
   - 'mediawiki-extensions-{phpflavor}':
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index e522fca..40da7e5 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1339,15 +1339,12 @@
   - mediawiki-core-php53lint
   - mediawiki-core-php55lint
   - mediawiki-phpunit-hhvm-trusty
-  - mediawiki-parsertests-hhvm-trusty
   -

[MediaWiki-commits] [Gerrit] integration/config[master]: mediawiki: Merge parsertests job back into main phpunit job

2016-09-14 Thread Krinkle (Code Review) 
Krinkle has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/310701

Change subject: mediawiki: Merge parsertests job back into main phpunit job
..

mediawiki: Merge parsertests job back into main phpunit job

This was originally separated because the parser tests were too slow.
Since recent refactoring they are much much faster. By accident, the
refactor also broke --exclude-group=ParserTests (fixed in ).
This meant that for the past week we've already been running parser tests
in the main phpunit jobs as well. And still, it wasn't the slowest job.

Change-Id: Ic2934746be68c06c1fc747e93f4fa73200eba652
---
M jjb/mediawiki.yaml
M zuul/layout.yaml
2 files changed, 4 insertions(+), 81 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/01/310701/1

diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 1342e29..033b930 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -105,7 +105,7 @@
 publishers:
  - mw-teardown
 
-# Runs all MediaWiki tests under hhvm on Nodepool instances
+# Runs all MediaWiki PHPUnit tests on Nodepool
 - job-template:
 name: 'mediawiki-phpunit-{phpflavor}-{image}'
 node: ci-{image}-wikimedia
@@ -124,43 +124,13 @@
  - 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"
+ - shell: "/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
-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
-# mediawiki-phpunit-parsertests-{phpflavor}
+# Runs all MediaWiki PHPUnit tests on a CI slave
 - job-template:
 name: 'mediawiki-phpunit-{phpflavor}'
 node: 'contintLabsSlave && phpflavor-{phpflavor}'
@@ -180,37 +150,7 @@
  - 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
- - mw-teardown-mysql
- - archive-log-dir
-
-# mediawiki-phpunit-parsertests-{phpflavor}
-#
-# Only runs the 'parsertests' MediaWiki testsuite.
-# Complements 'mediawiki-phpunit-{phpflavor}'.
-- job-template:
-name: 'mediawiki-phpunit-parsertests-{phpflavor}'
-node: 'contintLabsSlave && phpflavor-{phpflavor}'
-concurrent: true
-properties:
- - throttle-one-per-node
-triggers:
- - zuul
-builders:
- - 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"
+ - shell: "/srv/deployment/integration/slave-scripts/bin/mw-phpunit.sh"
 publishers:
  - phpunit-junit-2
  - mw-teardown-mysql
@@ -361,9 +301,6 @@
   - 'mediawiki-phpunit-{phpflavor}':
   phpflavor:
   - php53
-  - 'mediawiki-phpunit-parsertests-{phpflavor}':
-  phpflavor:
-  - php53
   - 'mediawiki-phpunit-{phpflavor}-{image}': _images
   phpflavor:
   - php55:
@@ -373,7 +310,6 @@
   image: trusty
   - hhvm:
   image: jessie
-  - 'mediawiki-parsertests-{phpflavor}-{image}': *phpflavor_images
 
   - 'mediawiki-phpunit-{phpflavor}-composer'
   - 'mediawiki-extensions-{phpflavor}':
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index e522fca..40da7e5 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1339,15 +1339,12 @@
   - mediawiki-core-php53lint
   - mediawiki-core-php55lint
   - mediawiki-phpunit-hhvm-trusty
-  -