Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/269613
Change subject: Drop php- prefix for composer validate jobs, pin to trusty
......................................................................
Drop php- prefix for composer validate jobs, pin to trusty
Change-Id: Iea6d5b584bdec8c696edcf2cd33a0cb53801c827
---
M jjb/php.yaml
M tests/test_zuul_scheduler.py
M zuul/layout.yaml
3 files changed, 60 insertions(+), 60 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/13/269613/1
diff --git a/jjb/php.yaml b/jjb/php.yaml
index a26eb21..8525017 100644
--- a/jjb/php.yaml
+++ b/jjb/php.yaml
@@ -3,8 +3,8 @@
# Job for libraries that are published as composer packages.
# Includes full validation that packagist.org requires.
- job:
- name: php-composer-package-validate
- node: contintLabsSlave && UbuntuPrecise
+ name: composer-package-validate
+ node: contintLabsSlave && UbuntuTrusty
defaults: use-remote-zuul-shallow-clone
concurrent: true
@@ -18,8 +18,8 @@
# Job for anything with a composer.json, but *isn't* going to be
# published on packagist.org.
- job:
- name: php-composer-validate
- node: contintLabsSlave && UbuntuPrecise
+ name: composer-validate
+ node: contintLabsSlave && UbuntuTrusty
defaults: use-remote-zuul-shallow-clone
concurrent: true
diff --git a/tests/test_zuul_scheduler.py b/tests/test_zuul_scheduler.py
index 07fe6da..32b7168 100644
--- a/tests/test_zuul_scheduler.py
+++ b/tests/test_zuul_scheduler.py
@@ -111,14 +111,14 @@
# Tests
def assertProjectHasComposerValidate(self, name, definition, pipeline):
- # php-composer-validate
- # php-composer-validate-package
- # php-composer-test-(zend|hhvm)
+ # composer-validate
+ # composer-validate-package
+ # composer-test-(zend|hhvm)
self.assertTrue(
any([job for job in definition
- if job.startswith(('php-composer', 'composer-'))]),
+ if job.startswith(('composer', 'composer-'))]),
'Project %s pipeline %s must have either '
- 'php-composer-validate or a composer-* job'
+ 'composer-validate or a composer-* job'
% (name, pipeline))
def assertProjectHasPhplint(self, name, definition, pipeline):
@@ -293,8 +293,8 @@
'.*-puppetlint-(strict|lenient)',
'.*-whitespaces',
'noop',
- 'php-composer-validate',
- 'php-composer-package-validate',
+ 'composer-validate',
+ 'composer-package-validate',
'fail-archived-repositories',
'tox-jessie',
]
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 5d3819e..eeb5b88 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -622,11 +622,11 @@
files:
- '^.*\.pp$'
- - name: ^php-composer-validate$
+ - name: ^composer-validate$
files:
- '^composer.json$'
- - name: ^php-composer-package-validate$
+ - name: ^composer-package-validate$
files:
- '^composer.json$'
@@ -1193,7 +1193,7 @@
check:
- php53lint
- php55lint
- - php-composer-validate
+ - composer-validate
test:
- php53lint
- php55lint
@@ -1201,7 +1201,7 @@
- 'mwext-{name}-testextension-php53'
- 'mwext-{name}-testextension-php55'
- 'mwext-{name}-testextension-hhvm'
- - php-composer-validate
+ - composer-validate
gate-and-submit:
- mediawiki-gate
- php53lint
@@ -1210,7 +1210,7 @@
- 'mwext-{name}-testextension-php53'
- 'mwext-{name}-testextension-php55'
- 'mwext-{name}-testextension-hhvm'
- - php-composer-validate
+ - composer-validate
experimental:
- 'mediawiki-extensions-hhvm'
- mediawiki-extensions-qunit
@@ -1224,14 +1224,14 @@
check:
- php53lint
- php55lint
- - php-composer-validate
+ - composer-validate
test:
- php53lint
- php55lint
- mwext-testextension-php53-composer
- mwext-testextension-php55-composer
- mwext-testextension-hhvm-composer
- - php-composer-validate
+ - composer-validate
gate-and-submit:
- mediawiki-gate
- php53lint
@@ -1239,7 +1239,7 @@
- mwext-testextension-php53-composer
- mwext-testextension-php55-composer
- mwext-testextension-hhvm-composer
- - php-composer-validate
+ - composer-validate
experimental:
- mwext-qunit-composer
- npm
@@ -1249,7 +1249,7 @@
check:
- php53lint
- php55lint
- - php-composer-validate
+ - composer-validate
test:
- php53lint
- php55lint
@@ -1257,7 +1257,7 @@
- mwext-testextension-php53
- mwext-testextension-php55
- mwext-testextension-hhvm
- - php-composer-validate
+ - composer-validate
gate-and-submit:
- mediawiki-gate
- php53lint
@@ -1266,7 +1266,7 @@
- mwext-testextension-php53
- mwext-testextension-php55
- mwext-testextension-hhvm
- - php-composer-validate
+ - composer-validate
experimental:
- mediawiki-extensions-hhvm
- mediawiki-extensions-qunit
@@ -1330,13 +1330,13 @@
- 'mwext-{name}-jslint'
- php53lint
- php55lint
- - php-composer-validate
+ - composer-validate
gate-and-submit:
- mediawiki-gate
- 'mwext-{name}-jslint'
- php53lint
- php55lint
- - php-composer-validate
+ - composer-validate
- name: jsduck
test:
@@ -1350,13 +1350,13 @@
- php53lint
- php55lint
- jsonlint
- - php-composer-validate
+ - composer-validate
gate-and-submit:
- mediawiki-gate
- php53lint
- php55lint
- jsonlint
- - php-composer-validate
+ - composer-validate
experimental:
- mwext-qunit-composer
- mwext-qunit
@@ -1371,18 +1371,18 @@
- php53lint
- php55lint
- jsonlint
- - php-composer-validate
+ - composer-validate
test:
- php53lint
- php55lint
- jsonlint
- - php-composer-validate
+ - composer-validate
gate-and-submit:
- mediawiki-gate
- php53lint
- php55lint
- jsonlint
- - php-composer-validate
+ - composer-validate
experimental:
- mwext-qunit-composer
- mwext-qunit
@@ -1395,7 +1395,7 @@
check:
- php53lint
- php55lint
- - php-composer-validate
+ - composer-validate
test:
- composer-php53
gate-and-submit:
@@ -1419,7 +1419,7 @@
- name: composer-test-package
check:
- - php-composer-package-validate
+ - composer-package-validate
- php53lint
- php55lint
test:
@@ -1549,7 +1549,7 @@
- mediawiki-core-jslint
- mediawiki-core-php53lint
- mediawiki-core-php55lint
- - php-composer-package-validate
+ - composer-package-validate
test:
- mediawiki-core-phpcs
- mediawiki-core-jsduck
@@ -1561,7 +1561,7 @@
- mediawiki-phpunit-php55
- mediawiki-phpunit-parsertests-php55
- mediawiki-core-qunit
- - php-composer-package-validate
+ - composer-package-validate
php53:
# Comment "check php53" to manually run this
- mediawiki-phpunit-php53
@@ -1581,7 +1581,7 @@
- mediawiki-phpunit-php55
- mediawiki-phpunit-parsertests-php55
- mediawiki-core-qunit
- - php-composer-package-validate
+ - composer-package-validate
postmerge:
- mediawiki-core-jsduck-publish
- mediawiki-core-doxygen-publish
@@ -1603,11 +1603,11 @@
check:
- php53lint
- php55lint
- - php-composer-validate
+ - composer-validate
test:
- php53lint
- php55lint
- - php-composer-validate
+ - composer-validate
- mediawiki-core-qunit
- mediawiki-phpunit-hhvm
- mediawiki-phpunit-parsertests-hhvm
@@ -1622,7 +1622,7 @@
- mediawiki-phpunit-php53
- mediawiki-phpunit-parsertests-php53
- mediawiki-core-qunit
- - php-composer-validate
+ - composer-validate
- name: analytics/aggregator
template:
@@ -2218,7 +2218,7 @@
- name: operations/mediawiki-config
check:
- operations-mw-config-php53lint
- - php-composer-validate
+ - composer-validate
test:
- operations-mw-config-php53lint
- operations-mw-config-phpunit
@@ -2445,15 +2445,15 @@
- name: jsonlint
check:
- php53lint
- - php-composer-validate
+ - composer-validate
test:
- php53lint
- phpunit
- - php-composer-validate
+ - composer-validate
gate-and-submit:
- php53lint
- phpunit
- - php-composer-validate
+ - composer-validate
- name: wikimedia/textcat
template:
@@ -2733,14 +2733,14 @@
check:
- jsonlint
- php53lint
- - php-composer-validate
+ - composer-validate
test:
- php53lint
- - php-composer-validate
+ - composer-validate
gate-and-submit:
- mediawiki-gate
- php53lint
- - php-composer-validate
+ - composer-validate
experimental:
- mediawiki-extensions-hhvm
- mediawiki-extensions-qunit
@@ -5852,11 +5852,11 @@
check:
- jsonlint
- php53lint
- - php-composer-package-validate
+ - composer-package-validate
test:
- jsonlint
- php53lint
- - php-composer-package-validate
+ - composer-package-validate
- mwext-WikibaseQuality-repo-tests-sqlite-hhvm
- mwext-WikibaseQuality-repo-tests-mysql-hhvm
- mwext-WikibaseQuality-qunit
@@ -5866,7 +5866,7 @@
gate-and-submit:
- jsonlint
- php53lint
- - php-composer-package-validate
+ - composer-package-validate
- mwext-WikibaseQuality-repo-tests-sqlite-php53
- mwext-WikibaseQuality-repo-tests-mysql-php53
- mwext-WikibaseQuality-repo-tests-sqlite-hhvm
@@ -5879,11 +5879,11 @@
check:
- jsonlint
- php53lint
- - php-composer-package-validate
+ - composer-package-validate
test:
- jsonlint
- php53lint
- - php-composer-package-validate
+ - composer-package-validate
- mwext-WikibaseQualityConstraints-repo-tests-sqlite-hhvm
- mwext-WikibaseQualityConstraints-repo-tests-mysql-hhvm
- mwext-WikibaseQualityConstraints-qunit
@@ -5893,7 +5893,7 @@
gate-and-submit:
- jsonlint
- php53lint
- - php-composer-package-validate
+ - composer-package-validate
- mwext-WikibaseQualityConstraints-repo-tests-sqlite-php53
- mwext-WikibaseQualityConstraints-repo-tests-mysql-php53
- mwext-WikibaseQualityConstraints-repo-tests-sqlite-hhvm
@@ -5906,11 +5906,11 @@
check:
- jsonlint
- php53lint
- - php-composer-package-validate
+ - composer-package-validate
test:
- jsonlint
- php53lint
- - php-composer-package-validate
+ - composer-package-validate
- mwext-WikibaseQualityExternalValidation-repo-tests-sqlite-hhvm
- mwext-WikibaseQualityExternalValidation-repo-tests-mysql-hhvm
- mwext-WikibaseQualityExternalValidation-qunit
@@ -5920,7 +5920,7 @@
gate-and-submit:
- jsonlint
- php53lint
- - php-composer-package-validate
+ - composer-package-validate
- mwext-WikibaseQualityExternalValidation-repo-tests-sqlite-php53
- mwext-WikibaseQualityExternalValidation-repo-tests-mysql-php53
- mwext-WikibaseQualityExternalValidation-repo-tests-sqlite-hhvm
@@ -6667,7 +6667,7 @@
- jshint
- jsonlint
- php53lint
- - php-composer-validate
+ - composer-validate
test: *semanticbundle_jobs
gate-and-submit: *semanticbundle_jobs
@@ -7013,16 +7013,16 @@
- jsonlint
- php53lint
- perllint
- - php-composer-validate
+ - composer-validate
test:
- php53lint
- perllint
- - php-composer-validate
+ - composer-validate
gate-and-submit:
- mediawiki-gate
- php53lint
- perllint
- - php-composer-validate
+ - composer-validate
experimental:
- mediawiki-extensions-hhvm
- mediawiki-extensions-qunit
@@ -7270,7 +7270,7 @@
- jshint
- jsonlint
- php53lint
- - php-composer-validate
+ - composer-validate
php53: # 'check php53'
- mwext-Wikibase-repo-tests-mysql-php53
- mwext-Wikibase-repo-tests-sqlite-php53
@@ -7278,7 +7278,7 @@
- mwext-Wikibase-client-tests-sqlite-php53
test:
- php53lint
- - php-composer-validate
+ - composer-validate
- mwext-mw-selenium-composer
- mwext-Wikibase-repo-tests-mysql-hhvm
- mwext-Wikibase-repo-tests-sqlite-hhvm
@@ -7287,7 +7287,7 @@
- mwext-Wikibase-qunit
gate-and-submit:
- php53lint
- - php-composer-validate
+ - composer-validate
- mwext-mw-selenium-composer
- mwext-Wikibase-repo-tests-mysql-php53
- mwext-Wikibase-repo-tests-sqlite-php53
--
To view, visit https://gerrit.wikimedia.org/r/269613
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea6d5b584bdec8c696edcf2cd33a0cb53801c827
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
