jenkins-bot has submitted this change and it was merged.
Change subject: Use composer for ContentTranslation phplint and phpcs
......................................................................
Use composer for ContentTranslation phplint and phpcs
Bug: T90943
Change-Id: Ib7c2b34c9706954ace474f8358a13de566e1e294
---
M tests/test_zuul_layout.py
M zuul/layout.yaml
2 files changed, 4 insertions(+), 15 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/test_zuul_layout.py b/tests/test_zuul_layout.py
index 53c587c..ae8f2db 100644
--- a/tests/test_zuul_layout.py
+++ b/tests/test_zuul_layout.py
@@ -128,11 +128,9 @@
'Project %s lacks %s pipeline' %
(mw_project, pipeline))
self.assertTrue(
- ('php-composer-validate' in project_def[pipeline]) or
- ('php-composer-package-validate' in
- project_def[pipeline]) or any(
- [job for job in project_def[pipeline]
- if job.endswith('-composer')]),
+ any([job for job in project_def[pipeline]
+ if job.endswith('-composer') or
+ job.startswith('php-composer')]),
'Project %s pipeline %s must have either '
'php-composer-validate or a *-composer job'
% (mw_project, pipeline))
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index dbd3a83..8c2b769 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -469,8 +469,6 @@
- name: mwext-cldr-phpcs-HEAD
voting: true
- - name: mwext-ContentTranslation-phpcs-HEAD
- voting: true
- name: mwext-Interwiki-phpcs-HEAD
voting: true
- name: mwext-MobileFrontend-phpcs-HEAD
@@ -3045,32 +3043,25 @@
- name: mediawiki/extensions/ContentTranslation
check:
- - mwext-ContentTranslation-phpcs-HEAD
- mwext-ContentTranslation-jslint
- mwext-ContentTranslation-lint
- mwext-ContentTranslation-ruby1.9.3lint
- mwext-ContentTranslation-yamllint
- php-composer-validate
test:
- - mwext-ContentTranslation-phpcs-HEAD
- mwext-ContentTranslation-jslint
- - mwext-ContentTranslation-lint
- mwext-ContentTranslation-bundle-rubocop
- mwext-ContentTranslation-ruby1.9.3lint
- mwext-ContentTranslation-yamllint
- mwext-ContentTranslation-qunit
- - php-composer-validate
+ - php-composer-test
gate-and-submit:
- mediawiki-gate
- - mwext-ContentTranslation-phpcs-HEAD
- mwext-ContentTranslation-jslint
- - mwext-ContentTranslation-lint
- mwext-ContentTranslation-bundle-rubocop
- mwext-ContentTranslation-ruby1.9.3lint
- mwext-ContentTranslation-yamllint
- mwext-ContentTranslation-qunit
- - php-composer-validate
- experimental:
- php-composer-test
- name: mediawiki/extensions/ContributionScores
--
To view, visit https://gerrit.wikimedia.org/r/194340
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib7c2b34c9706954ace474f8358a13de566e1e294
Gerrit-PatchSet: 8
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Amire80 <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
