Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304145
Change subject: Revert "Temporarily move composer-hhvm/php5 jobs off of
nodepool"
......................................................................
Revert "Temporarily move composer-hhvm/php5 jobs off of nodepool"
This reverts commit 66856c5347f21791186056eb22dd8825de7bc8e3.
Change-Id: I85c101fe39dc98f65a6d069a4c621ecfb22bd1e6
---
M jjb/php.yaml
M zuul/layout.yaml
2 files changed, 42 insertions(+), 40 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/45/304145/1
diff --git a/jjb/php.yaml b/jjb/php.yaml
index 18e4fad..f9545ff 100644
--- a/jjb/php.yaml
+++ b/jjb/php.yaml
@@ -104,10 +104,11 @@
- 'composer-php53'
- 'composer-package-php53'
-# Runs "composer update" and "composer test"
+# Same as 'composer-{phpflavor}'. Runs "composer update" and "composer test"
+# but on disposable instances maintained by Nodepool.
- job-template:
- name: 'composer-{phpflavor}'
- node: contintLabsSlave && phpflavor-{phpflavor}
+ name: 'composer-{phpflavor}-{image}'
+ node: ci-{image}-wikimedia
defaults: use-remote-zuul-shallow-clone
concurrent: true
logrotate:
@@ -117,11 +118,14 @@
builders:
- assert-phpflavor:
phpflavor: '{phpflavor}'
+ - castor-load
- composer-validate:
dir: '.'
- composer-update:
dir: '.'
- composer-test
+ publishers:
+ - castor-save
# Same as 'composer-package-{phpflavor}'. Runs "composer update" and "composer
# test" for libraries that are published as composer packages but on disposable
@@ -159,11 +163,4 @@
image: jessie
jobs:
- 'composer-package-{phpflavor}-{image}'
-
-- project:
- name: 'composer-flavored'
- phpflavor:
- - php55
- - hhvm
- jobs:
- - 'composer-{phpflavor}'
+ - 'composer-{phpflavor}-{image}'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 4ac3d0a..65e0e2e 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -711,7 +711,7 @@
# Don't run tests on deployment branches where the tests have been removed.
# Covered by test_smashpig_deployment_branch_filters
- - name: ^composer-hhvm$
+ - name: ^composer-hhvm-trusty$
skip-if:
- project: ^wikimedia/fundraising/SmashPig$
branch: ^deployment$
@@ -913,8 +913,8 @@
- mwext-qunit-composer-jessie
- npm-node-4.3
- composer-php53
- - composer-php55
- - composer-hhvm
+ - composer-php55-trusty
+ - composer-hhvm-trusty
- name: extension-unittests-composer-non-voting
check:
@@ -936,8 +936,8 @@
experimental:
- mwext-qunit-composer-jessie
- composer-php53
- - composer-php55
- - composer-hhvm
+ - composer-php55-trusty
+ - composer-hhvm-trusty
- name: extension-unittests-generic
check:
@@ -967,8 +967,8 @@
- mwext-testextension-hhvm-composer
- npm-node-4.3
- composer-php53
- - composer-php55
- - composer-hhvm
+ - composer-php55-trusty
+ - composer-hhvm-trusty
- name: extension-unittests-non-voting
check:
@@ -995,8 +995,8 @@
- mwext-testextension-hhvm-composer
- npm-node-4.3
- composer-php53
- - composer-php55
- - composer-hhvm
+ - composer-php55-trusty
+ - composer-hhvm-trusty
# Template to run per-patch selenium browser test
# Intentionally not in gate because it's super slow
@@ -1067,8 +1067,8 @@
- mwext-testextension-hhvm-composer
- npm-node-4.3
- composer-php53
- - composer-php55
- - composer-hhvm
+ - composer-php55-trusty
+ - composer-hhvm-trusty
# Similar to above, but uses a check/test pipeline
- name: mw-checks-test
@@ -1094,8 +1094,8 @@
- mwext-testextension-hhvm-composer
- npm-node-4.3
- composer-php53
- - composer-php55
- - composer-hhvm
+ - composer-php55-trusty
+ - composer-hhvm-trusty
- name: composer-test
check:
@@ -1104,23 +1104,27 @@
- composer-validate
test:
- composer-php53
- - composer-php55
- - composer-hhvm
+ - composer-php55-trusty
+ - composer-hhvm-trusty
gate-and-submit:
- composer-php53
- - composer-php55
- - composer-hhvm
+ - composer-php55-trusty
+ - composer-hhvm-trusty
+ experimental:
+ - composer-hhvm-jessie
- name: composer-test55
check:
- php55lint
- composer-validate
test:
- - composer-php55
- - composer-hhvm
+ - composer-php55-trusty
+ - composer-hhvm-trusty
gate-and-submit:
- - composer-php55
- - composer-hhvm
+ - composer-php55-trusty
+ - composer-hhvm-trusty
+ experimental:
+ - composer-hhvm-jessie
- name: jshint
check:
@@ -1584,9 +1588,9 @@
- php55lint
- composer-validate
test:
- - composer-php55
+ - composer-php55-trusty
gate-and-submit:
- - composer-php55
+ - composer-php55-trusty
- name: labs/tools/Luke081515IRCBot
check-voter:
@@ -2187,8 +2191,9 @@
- operations-mw-config-phpunit
- operations-mw-config-typos
experimental:
- - composer-php55
- - composer-hhvm
+ - composer-php55-trusty
+ - composer-hhvm-trusty
+ - composer-hhvm-jessie
postmerge:
- beta-mediawiki-config-update-eqiad
@@ -2401,13 +2406,13 @@
- php53lint
- php55lint
- composer-php53
- - composer-hhvm
+ - composer-hhvm-trusty
- composer-validate
gate-and-submit:
- php53lint
- php55lint
- composer-php53
- - composer-hhvm
+ - composer-hhvm-trusty
- composer-validate
- name: wikimedia/fundraising/slander
@@ -2424,13 +2429,13 @@
# TODO: clean up the composer.json, then enable validation here...
#- composer-validate
- composer-php53
- - composer-hhvm
+ - composer-hhvm-trusty
gate-and-submit:
- php53lint
- php55lint
#- composer-validate
- composer-php53
- - composer-hhvm
+ - composer-hhvm-trusty
- name: wikimedia/iegreview
template:
--
To view, visit https://gerrit.wikimedia.org/r/304145
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I85c101fe39dc98f65a6d069a4c621ecfb22bd1e6
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
