Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/304131
Change subject: Temporarily move composer-hhvm/php5 jobs off of nodepool ...................................................................... Temporarily move composer-hhvm/php5 jobs off of nodepool We're running low on capacity so moving these quick jobs off of nodepool should help a lot. Change-Id: I7b5ddf2d9a6ba2d00819bd9eff6d77a9754dda72 --- M jjb/php.yaml M zuul/layout.yaml 2 files changed, 40 insertions(+), 42 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/31/304131/1 diff --git a/jjb/php.yaml b/jjb/php.yaml index f9545ff..18e4fad 100644 --- a/jjb/php.yaml +++ b/jjb/php.yaml @@ -104,11 +104,10 @@ - 'composer-php53' - 'composer-package-php53' -# Same as 'composer-{phpflavor}'. Runs "composer update" and "composer test" -# but on disposable instances maintained by Nodepool. +# Runs "composer update" and "composer test" - job-template: - name: 'composer-{phpflavor}-{image}' - node: ci-{image}-wikimedia + name: 'composer-{phpflavor}' + node: contintLabsSlave && phpflavor-{phpflavor} defaults: use-remote-zuul-shallow-clone concurrent: true logrotate: @@ -118,14 +117,11 @@ 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 @@ -163,4 +159,11 @@ image: jessie jobs: - 'composer-package-{phpflavor}-{image}' - - 'composer-{phpflavor}-{image}' + +- project: + name: 'composer-flavored' + phpflavor: + - php55 + - hhvm + jobs: + - 'composer-{phpflavor}' diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 65e0e2e..4ac3d0a 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-trusty$ + - name: ^composer-hhvm$ skip-if: - project: ^wikimedia/fundraising/SmashPig$ branch: ^deployment$ @@ -913,8 +913,8 @@ - mwext-qunit-composer-jessie - npm-node-4.3 - composer-php53 - - composer-php55-trusty - - composer-hhvm-trusty + - composer-php55 + - composer-hhvm - name: extension-unittests-composer-non-voting check: @@ -936,8 +936,8 @@ experimental: - mwext-qunit-composer-jessie - composer-php53 - - composer-php55-trusty - - composer-hhvm-trusty + - composer-php55 + - composer-hhvm - name: extension-unittests-generic check: @@ -967,8 +967,8 @@ - mwext-testextension-hhvm-composer - npm-node-4.3 - composer-php53 - - composer-php55-trusty - - composer-hhvm-trusty + - composer-php55 + - composer-hhvm - name: extension-unittests-non-voting check: @@ -995,8 +995,8 @@ - mwext-testextension-hhvm-composer - npm-node-4.3 - composer-php53 - - composer-php55-trusty - - composer-hhvm-trusty + - composer-php55 + - composer-hhvm # 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-trusty - - composer-hhvm-trusty + - composer-php55 + - composer-hhvm # 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-trusty - - composer-hhvm-trusty + - composer-php55 + - composer-hhvm - name: composer-test check: @@ -1104,27 +1104,23 @@ - composer-validate test: - composer-php53 - - composer-php55-trusty - - composer-hhvm-trusty + - composer-php55 + - composer-hhvm gate-and-submit: - composer-php53 - - composer-php55-trusty - - composer-hhvm-trusty - experimental: - - composer-hhvm-jessie + - composer-php55 + - composer-hhvm - name: composer-test55 check: - php55lint - composer-validate test: - - composer-php55-trusty - - composer-hhvm-trusty + - composer-php55 + - composer-hhvm gate-and-submit: - - composer-php55-trusty - - composer-hhvm-trusty - experimental: - - composer-hhvm-jessie + - composer-php55 + - composer-hhvm - name: jshint check: @@ -1588,9 +1584,9 @@ - php55lint - composer-validate test: - - composer-php55-trusty + - composer-php55 gate-and-submit: - - composer-php55-trusty + - composer-php55 - name: labs/tools/Luke081515IRCBot check-voter: @@ -2191,9 +2187,8 @@ - operations-mw-config-phpunit - operations-mw-config-typos experimental: - - composer-php55-trusty - - composer-hhvm-trusty - - composer-hhvm-jessie + - composer-php55 + - composer-hhvm postmerge: - beta-mediawiki-config-update-eqiad @@ -2406,13 +2401,13 @@ - php53lint - php55lint - composer-php53 - - composer-hhvm-trusty + - composer-hhvm - composer-validate gate-and-submit: - php53lint - php55lint - composer-php53 - - composer-hhvm-trusty + - composer-hhvm - composer-validate - name: wikimedia/fundraising/slander @@ -2429,13 +2424,13 @@ # TODO: clean up the composer.json, then enable validation here... #- composer-validate - composer-php53 - - composer-hhvm-trusty + - composer-hhvm gate-and-submit: - php53lint - php55lint #- composer-validate - composer-php53 - - composer-hhvm-trusty + - composer-hhvm - name: wikimedia/iegreview template: -- To view, visit https://gerrit.wikimedia.org/r/304131 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7b5ddf2d9a6ba2d00819bd9eff6d77a9754dda72 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits