Legoktm has submitted this change and it was merged.
Change subject: Move mediawiki-core-phpcs off of nodepool
......................................................................
Move mediawiki-core-phpcs off of nodepool
Change-Id: I8bfe038562466c623eb88712723b159c7829c457
---
M jjb/mediawiki.yaml
M zuul/layout.yaml
M zuul/parameter_functions.py
3 files changed, 6 insertions(+), 9 deletions(-)
Approvals:
Legoktm: Verified; Looks good to me, approved
Zppix: Looks good to me, but someone else must approve
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 5481ced..05021ca 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -498,15 +498,14 @@
# Special job to run MW-CS against MediaWiki core.
# Can't run it through composer because it'll timeout.
- job:
- name: 'mediawiki-core-phpcs-trusty'
- node: ci-trusty-wikimedia
+ name: 'mediawiki-core-phpcs'
+ node: contintLabsSlave && phpflavor-hhvm
concurrent: true
logrotate:
daysToKeep: 15
triggers:
- zuul
builders:
- - castor-load
- zuul-cloner:
projects: >
mediawiki/core
@@ -515,5 +514,3 @@
- shell: |
cd $WORKSPACE/src
vendor/bin/phpcs -p -s
- publishers:
- - castor-save
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 4ac3d0a..30cfb7a 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -740,7 +740,7 @@
branch: (?!REL1_23|REL1_24|REL1_25|REL1_26|fundraising/REL.*)
queue-name: mediawiki
- - name: mediawiki-core-phpcs-trusty
+ - name: mediawiki-core-phpcs
branch: (?!^REL1_23|^REL1_24|^REL1_25|^REL1_26|^fundraising/REL)
files:
- '^.*\.(json|php|php5|phtml|inc|xml)$'
@@ -1301,7 +1301,7 @@
- mediawiki-core-php55lint
- composer-package-validate
test:
- - mediawiki-core-phpcs-trusty
+ - mediawiki-core-phpcs
- mediawiki-core-jsduck
- mediawiki-core-npm-node-4.3
- mediawiki-core-php53lint
@@ -1321,7 +1321,7 @@
- mediawiki-core-npm-node-4.3
- mediawiki-core-php53lint
- mediawiki-core-php55lint
- - mediawiki-core-phpcs-trusty
+ - mediawiki-core-phpcs
- mediawiki-phpunit-hhvm-trusty
- mediawiki-parsertests-hhvm-trusty
- mediawiki-phpunit-hhvm-composer
diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index a597b98..d9efae8 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -18,7 +18,7 @@
params['DISPLAY'] = ':94'
hhvm_jobs = (
- 'mediawiki-core-phpcs-trusty',
+ 'mediawiki-core-phpcs',
'mw-tools-codesniffer-mwcore-testrun',
)
php5_jobs = (
--
To view, visit https://gerrit.wikimedia.org/r/304149
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8bfe038562466c623eb88712723b159c7829c457
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Zppix <supp...@zppixballee.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
