jenkins-bot has submitted this change and it was merged.
Change subject: mediawiki-core-qunit to Nodepool
......................................................................
mediawiki-core-qunit to Nodepool
Jessie instances now have Apache localhost worker enabled with
Zend 5.6 and NodeJS 4.3.
Point CLI php to Zend 5.x since the Apache webhost is using mod_php5 and
hence Zend. This way both CLI and Apache are using the same php flavor.
Bug: T136301
Change-Id: I386799d9b1abf2431ad1e19949668c5509909323
---
M jjb/mediawiki.yaml
M zuul/layout.yaml
M zuul/parameter_functions.py
3 files changed, 19 insertions(+), 14 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 4810081..89615fe 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -32,18 +32,18 @@
publishers:
- castor-save
-
- job-template:
- name: 'mediawiki-core-qunit'
- node: contintLabsSlave && UbuntuTrusty
+ name: 'mediawiki-core-qunit-jessie'
+ node: ci-jessie-wikimedia
concurrent: true
- logrotate:
- daysToKeep: 15
properties:
- - throttle-one-per-node
+ - zeromq-event
triggers:
- zuul
+ logrotate:
+ daysToKeep: 15
builders:
+ - castor-load
- zuul-cloner:
projects: >
mediawiki/core
@@ -52,8 +52,7 @@
- mw-apply-settings
- qunit-karma
publishers:
- - localhost-cleanup
- - mw-teardown-mysql
+ - castor-save
- archive-log-dir
- job-template:
@@ -363,7 +362,7 @@
- php53
- php55
jobs:
- - 'mediawiki-core-qunit'
+ - 'mediawiki-core-qunit-jessie'
- 'mediawiki-core-jsduck'
- 'mediawiki-core-npm-node-4.3'
- 'mediawiki-core-jsduck-publish'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index aa81984..9f63196 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -865,7 +865,7 @@
- name: mediawiki-phpunit-php53
queue-name: mediawiki
- - name: mediawiki-core-qunit
+ - name: mediawiki-core-qunit-jessie
queue-name: mediawiki
- name: mediawiki-core-jsduck
@@ -1300,7 +1300,7 @@
- mediawiki-core-php55lint
- mediawiki-phpunit-hhvm-trusty
- mediawiki-parsertests-hhvm-trusty
- - mediawiki-core-qunit
+ - mediawiki-core-qunit-jessie
- composer-package-validate
php5:
# Comment "check php5" to manually run this
@@ -1321,7 +1321,7 @@
- mediawiki-phpunit-parsertests-php53
- mediawiki-phpunit-php55-trusty
- mediawiki-parsertests-php55-trusty
- - mediawiki-core-qunit
+ - mediawiki-core-qunit-jessie
- composer-package-validate
postmerge:
- mediawiki-core-jsduck-publish
@@ -1356,7 +1356,7 @@
- php53lint
- php55lint
- composer-validate
- - mediawiki-core-qunit
+ - mediawiki-core-qunit-jessie
- mediawiki-phpunit-hhvm-trusty
- mediawiki-parsertests-hhvm-trusty
php5:
@@ -1373,7 +1373,7 @@
- mediawiki-parsertests-php55-trusty
- mediawiki-phpunit-php53
- mediawiki-phpunit-parsertests-php53
- - mediawiki-core-qunit
+ - mediawiki-core-qunit-jessie
- composer-validate
- name: analytics/aggregator
diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index 1ce2928..11c3c1b 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -21,6 +21,10 @@
'mediawiki-core-phpcs-trusty',
'mw-tools-codesniffer-mwcore-testrun',
)
+ php5_jobs = (
+ # Qunit localhost uses apache mod_php which is Zend. Lets be consistent
+ 'mediawiki-core-qunit-jessie',
+ )
# Sets a $PHP_BIN variable based on the job name
if 'php55' in job.name:
@@ -30,6 +34,8 @@
elif job.name in hhvm_jobs:
# T126394: This should always be HHVM
params['PHP_BIN'] = 'hhvm'
+ elif job.name in php5_jobs:
+ params['PHP_BIN'] = 'php5'
if job.name.endswith('node-4.3'):
# T128091: oojs/ui npm job runs on Jessie which only has HHVM
--
To view, visit https://gerrit.wikimedia.org/r/291322
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I386799d9b1abf2431ad1e19949668c5509909323
Gerrit-PatchSet: 5
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
