Paladox has uploaded a new change for review.

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

Change subject: Revert "Move mediawiki-core-phpcs off of nodepool"
......................................................................

Revert "Move mediawiki-core-phpcs off of nodepool"

This reverts commit d353f95ec906ddd637ce9328e9a42efe9743482c.

Change-Id: Icb44706eece7f3b7ac8f48df53ad07529a49b81c
---
M jjb/mediawiki.yaml
M zuul/layout.yaml
M zuul/parameter_functions.py
3 files changed, 9 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/50/304150/1

diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 05021ca..5481ced 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -498,14 +498,15 @@
 # Special job to run MW-CS against MediaWiki core.
 # Can't run it through composer because it'll timeout.
 - job:
-    name: 'mediawiki-core-phpcs'
-    node: contintLabsSlave && phpflavor-hhvm
+    name: 'mediawiki-core-phpcs-trusty'
+    node: ci-trusty-wikimedia
     concurrent: true
     logrotate:
         daysToKeep: 15
     triggers:
      - zuul
     builders:
+     - castor-load
      - zuul-cloner:
          projects: >
              mediawiki/core
@@ -514,3 +515,5 @@
      - shell: |
         cd $WORKSPACE/src
         vendor/bin/phpcs -p -s
+    publishers:
+     - castor-save
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 30cfb7a..4ac3d0a 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
+  - name: mediawiki-core-phpcs-trusty
     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
+      - mediawiki-core-phpcs-trusty
       - 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
+      - mediawiki-core-phpcs-trusty
       - 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 d9efae8..a597b98 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -18,7 +18,7 @@
     params['DISPLAY'] = ':94'
 
     hhvm_jobs = (
-        'mediawiki-core-phpcs',
+        'mediawiki-core-phpcs-trusty',
         'mw-tools-codesniffer-mwcore-testrun',
         )
     php5_jobs = (

-- 
To view, visit https://gerrit.wikimedia.org/r/304150
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb44706eece7f3b7ac8f48df53ad07529a49b81c
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to