Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266039
Change subject: Add PHP5.5 jobs for mediawiki/core
......................................................................
Add PHP5.5 jobs for mediawiki/core
Bug: T119675
Change-Id: I6ba6c2919c38155e7144a675b2244a4c94cb5e95
---
M jjb/macro.yaml
M jjb/mediawiki.yaml
M zuul/layout.yaml
A zuul/php_version.py
4 files changed, 34 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/39/266039/1
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index eac1c0f..18706ed 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -228,6 +228,9 @@
( 'php53' )
MATCHER='^PHP 5\.3'
;;
+ ( 'php55' )
+ MATCHER='^PHP 5\.5'
+ ;;
( * )
echo "Invalid phpflavor '{phpflavor}' for JJB macro
'assert-phpflavor'"
echo "Must be either 'hhvm' or 'zend'"
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index e9f624f..3b51b56 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 under PHP 5.3/5.5
#
# Excludes '@group ParserTests' tests which are run in parallel via
-# mediawiki-phpunit-parsertests-php53
+# mediawiki-phpunit-parsertests-php53/php55
- 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-php53/php55'
- 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-php53/php55
#
# Only runs the 'parsertests' MediaWiki testsuite.
-# Complements 'mediawiki-phpunit-parsertests-php53'.
+# Complements 'mediawiki-phpunit-parsertests-php53/php55'.
- job-template:
name: 'mediawiki-phpunit-parsertests-php53'
- node: 'contintLabsSlave && UbuntuPrecise && phpflavor-php53'
+ 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
@@ -261,6 +261,7 @@
# We want to reuse the same job template for both PHP flavor:
# - HHVM flavor runs on Trusty CI labs slaves with HHVM
# - PHP53 flavor runs on Precise CI labs slaves with Zend PHP 5.3
+ # - PHP55 flavor runs on Trusty CI labs slaves with Zend PHP 5.5
#
# Doing a '&& phpflavor-{phpflavor}' is the trick to vary the label
# definition based on the job name.
@@ -269,7 +270,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
@@ -360,6 +361,7 @@
phpflavor:
- hhvm
- php53
+ - php55
jobs:
- 'mediawiki-core-jslint'
- 'mediawiki-core-qunit'
@@ -370,8 +372,8 @@
- 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..5e80e27 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -20,6 +20,7 @@
- python-file: 'doc_functions.py'
- python-file: 'ext_dependencies.py'
- python-file: 'nodepool.py'
+ - python-file: 'php_version.py'
pipelines:
@@ -582,6 +583,8 @@
parameter-function: set_doc_variables
- name: ^mwext-(testextension|qunit|mw-selenium)
parameter-function: set_ext_dependencies
+ - name: ^.*php55.*$
+ parameter-function: set_php_bin
- name: ^integration-jjb-config-diff$
parameter-function: offline_when_complete
@@ -1550,6 +1553,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
+ - mediawiki-phpunit-php55
+ - mediawiki-phpunit-parsertests-php55
+ - mediawiki-extensions-php55
- name: mediawiki/debian
experimental:
diff --git a/zuul/php_version.py b/zuul/php_version.py
new file mode 100644
index 0000000..a7e742f
--- /dev/null
+++ b/zuul/php_version.py
@@ -0,0 +1,9 @@
+def set_php_bin(item, job, params):
+ """
+ Sets a $PHP_BIN variable based on the job name
+ :type item: zuul.model.QueueItem
+ :type job: zuul.model.Job
+ :type params: dict
+ """
+ if 'php55' in job.name:
+ params['PHP_BIN'] = 'php5'
--
To view, visit https://gerrit.wikimedia.org/r/266039
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ba6c2919c38155e7144a675b2244a4c94cb5e95
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
