Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/291505
Change subject: Migrate composer-validate to trusty nodepool
......................................................................
Migrate composer-validate to trusty nodepool
Change-Id: I2c3e561c518a1c0134f7330cb59e60504df8c394
---
M jjb/php.yaml
M tests/test_zuul_scheduler.py
M zuul/layout.yaml
M zuul/parameter_functions.py
4 files changed, 39 insertions(+), 35 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/05/291505/1
diff --git a/jjb/php.yaml b/jjb/php.yaml
index f1356fb..44405e7 100644
--- a/jjb/php.yaml
+++ b/jjb/php.yaml
@@ -48,11 +48,12 @@
# Job for anything with a composer.json, but *isn't* going to be
# published on packagist.org.
- job:
- name: composer-validate
- node: contintLabsSlave && UbuntuTrusty
+ name: composer-validate-trusty
+ node: ci-trusty-wikimedia
defaults: use-remote-zuul-shallow-clone
concurrent: true
-
+ properties:
+ - zeromq-event
triggers:
- zuul
builders:
diff --git a/tests/test_zuul_scheduler.py b/tests/test_zuul_scheduler.py
index b9b643a..0c73dfa 100644
--- a/tests/test_zuul_scheduler.py
+++ b/tests/test_zuul_scheduler.py
@@ -112,14 +112,14 @@
# Tests
def assertProjectHasComposerValidate(self, name, definition, pipeline):
- # composer-validate
+ # composer-validate-trusty
# composer-validate-package
# composer-test-(zend|hhvm)
self.assertTrue(
any([job for job in definition
if job.startswith(('composer', 'composer-'))]),
'Project %s pipeline %s must have either '
- 'composer-validate or a composer-* job'
+ 'composer-validate-trusty or a composer-* job'
% (name, pipeline))
def assertProjectHasPhplint(self, name, definition, pipeline):
@@ -298,7 +298,7 @@
'.*-puppetlint-strict',
'.*-whitespaces',
'noop',
- 'composer-validate',
+ 'composer-validate-trusty',
'composer-package-validate',
'fail-archived-repositories',
'tox-jessie',
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 3989181..32b9ada 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -643,7 +643,7 @@
files:
- '^.*\.pp$'
- - name: ^composer-validate$
+ - name: ^composer-validate-trusty$
files:
- '^composer.json$'
@@ -878,21 +878,21 @@
check:
- php53lint
- php55lint
- - composer-validate
+ - composer-validate-trusty
test:
- php53lint
- php55lint
- mwext-testextension-php53-composer
- mwext-testextension-php55-composer
- mwext-testextension-hhvm-composer
- - composer-validate
+ - composer-validate-trusty
gate-and-submit:
- php53lint
- php55lint
- mwext-testextension-php53-composer
- mwext-testextension-php55-composer
- mwext-testextension-hhvm-composer
- - composer-validate
+ - composer-validate-trusty
experimental:
- mwext-qunit-composer
- npm-node-4.3
@@ -904,19 +904,19 @@
check:
- php53lint
- php55lint
- - composer-validate
+ - composer-validate-trusty
test:
- php53lint
- php55lint
- mwext-testextension-php53-composer-non-voting
- mwext-testextension-php55-composer-non-voting
- mwext-testextension-hhvm-composer-non-voting
- - composer-validate
+ - composer-validate-trusty
gate-and-submit:
- mediawiki-gate
- php53lint
- php55lint
- - composer-validate
+ - composer-validate-trusty
experimental:
- mwext-qunit-composer
- composer-php53
@@ -927,7 +927,7 @@
check:
- php53lint
- php55lint
- - composer-validate
+ - composer-validate-trusty
test:
- php53lint
- php55lint
@@ -935,7 +935,7 @@
- mwext-testextension-php53
- mwext-testextension-php55
- mwext-testextension-hhvm
- - composer-validate
+ - composer-validate-trusty
gate-and-submit:
- php53lint
- php55lint
@@ -943,7 +943,7 @@
- mwext-testextension-php53
- mwext-testextension-php55
- mwext-testextension-hhvm
- - composer-validate
+ - composer-validate-trusty
experimental:
- mediawiki-extensions-hhvm
- mediawiki-extensions-qunit
@@ -958,20 +958,20 @@
check:
- php53lint
- php55lint
- - composer-validate
+ - composer-validate-trusty
test:
- php53lint
- php55lint
# Extensions tests with core+vendor
- mwext-testextension-hhvm-non-voting
- - composer-validate
+ - composer-validate-trusty
php5:
- mwext-testextension-php53-non-voting
- mwext-testextension-php55-non-voting
gate-and-submit:
- php53lint
- php55lint
- - composer-validate
+ - composer-validate-trusty
experimental:
- mediawiki-extensions-hhvm
- mediawiki-extensions-qunit
@@ -1037,12 +1037,12 @@
- php53lint
- php55lint
- jsonlint
- - composer-validate
+ - composer-validate-trusty
gate-and-submit:
- php53lint
- php55lint
- jsonlint
- - composer-validate
+ - composer-validate-trusty
experimental:
- mwext-qunit-composer
- mwext-qunit
@@ -1059,17 +1059,17 @@
- php53lint
- php55lint
- jsonlint
- - composer-validate
+ - composer-validate-trusty
test:
- php53lint
- php55lint
- jsonlint
- - composer-validate
+ - composer-validate-trusty
gate-and-submit:
- php53lint
- php55lint
- jsonlint
- - composer-validate
+ - composer-validate-trusty
experimental:
- mwext-qunit-composer
- mwext-qunit
@@ -1084,7 +1084,7 @@
check:
- php53lint
- php55lint
- - composer-validate
+ - composer-validate-trusty
test:
- composer-php53
- composer-php55-trusty
@@ -1099,7 +1099,7 @@
- name: composer-test55
check:
- php55lint
- - composer-validate
+ - composer-validate-trusty
test:
- composer-php55-trusty
- composer-hhvm-trusty
@@ -1335,11 +1335,11 @@
check:
- php53lint
- php55lint
- - composer-validate
+ - composer-validate-trusty
test:
- php53lint
- php55lint
- - composer-validate
+ - composer-validate-trusty
- mediawiki-core-qunit
- mediawiki-phpunit-hhvm-trusty
- mediawiki-parsertests-hhvm-trusty
@@ -1358,7 +1358,7 @@
- mediawiki-phpunit-php53
- mediawiki-phpunit-parsertests-php53
- mediawiki-core-qunit
- - composer-validate
+ - composer-validate-trusty
- name: analytics/aggregator
template:
@@ -1535,7 +1535,7 @@
- name: jsonlint
check:
- php55lint
- - composer-validate
+ - composer-validate-trusty
test:
- composer-php55-trusty
gate-and-submit:
@@ -2002,7 +2002,7 @@
- name: operations/mediawiki-config
check:
- operations-mw-config-php55lint
- - composer-validate
+ - composer-validate-trusty
test:
- operations-mw-config-php55lint
- operations-mw-config-phpunit
@@ -7090,7 +7090,7 @@
- jshint
- jsonlint
- php53lint
- - composer-validate
+ - composer-validate-trusty
test: *semanticbundle_jobs
gate-and-submit: *semanticbundle_jobs
@@ -7448,15 +7448,15 @@
- jsonlint
- php53lint
- perllint
- - composer-validate
+ - composer-validate-trusty
test:
- php53lint
- perllint
- - composer-validate
+ - composer-validate-trusty
gate-and-submit:
- php53lint
- perllint
- - composer-validate
+ - composer-validate-trusty
experimental:
- mediawiki-extensions-hhvm
- mediawiki-extensions-qunit
diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index 6f356d1..d4a13f9 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -35,6 +35,9 @@
# T128091: oojs/ui npm job runs on Jessie which only has HHVM
params['PHP_BIN'] = 'hhvm'
+ if job.name.endswith('composer-validate-trusty'):
+ params['PHP_BIN'] = 'php5'
+
ext_deps_jobs = ('mwext-testextension', 'mwext-qunit', 'mwext-mw-selenium')
if job.name.startswith(ext_deps_jobs):
set_ext_dependencies(item, job, params)
--
To view, visit https://gerrit.wikimedia.org/r/291505
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c3e561c518a1c0134f7330cb59e60504df8c394
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
