jenkins-bot has submitted this change and it was merged.
Change subject: Clean up phpcs macros and jobs (remove strict/lenient split)
......................................................................
Clean up phpcs macros and jobs (remove strict/lenient split)
If any of our repos had voting on for 'lenient' but not 'strict'
this would make sense, but that was never the case.
* Remove phpcs-lenient.
* Rename phpcs-strict to phpcs.
* Update phpcs macro to use the shell script instead of inline code.
* Remove mediawiki-core-regression-phpcs* which have been commented
out in zuul-config since early 2013.
* Remove obsolete 'mediawiki-core-phpcs-*-HEAD' settings which are
already covered by 'phpcs(-HEAD)?$'.
* Add 'voting: true' overrides for all strict/lenient jobs which
were previously implicitly voting but are now matching the override
that makes them all non-voting, so we add overrides to keep those
voting.
Bug: T50420
Change-Id: I0eaf2085576165ba93ca3ace14284902d3731aea
---
M jjb/job-templates.yaml
M jjb/macro.yaml
M jjb/mediawiki-extensions.yaml
M jjb/mediawiki.yaml
M zuul/layout.yaml
5 files changed, 51 insertions(+), 158 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index f174d10..3b3633f 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -181,66 +181,6 @@
- phpcs
- job-template:
- name: '{name}-phpcs-strict'
- node: hasSlaveScripts && UbuntuPrecise
- defaults: use-remote-zuul-no-submodules
- concurrent: true
- logrotate:
- daysToKeep: 90
- triggers:
- - zuul
- builders:
- - phpcs-strict
- publishers:
- - checkstyle-xml
- - phpcs
-
-- job-template:
- name: '{name}-phpcs-strict-HEAD'
- node: hasSlaveScripts && UbuntuPrecise
- defaults: use-remote-zuul-no-submodules
- concurrent: true
- logrotate:
- daysToKeep: 90
- triggers:
- - zuul
- builders:
- - phpcs-strict-HEAD
- publishers:
- - checkstyle-xml
- - phpcs
-
-- job-template:
- name: '{name}-phpcs-lenient'
- node: hasSlaveScripts && UbuntuPrecise
- defaults: use-remote-zuul-no-submodules
- concurrent: true
- logrotate:
- daysToKeep: 90
- triggers:
- - zuul
- builders:
- - phpcs-lenient
- publishers:
- - checkstyle-xml
- - phpcs
-
-- job-template:
- name: '{name}-phpcs-lenient-HEAD'
- node: hasSlaveScripts && UbuntuPrecise
- defaults: use-remote-zuul-no-submodules
- concurrent: true
- logrotate:
- daysToKeep: 90
- triggers:
- - zuul
- builders:
- - phpcs-lenient-HEAD
- publishers:
- - checkstyle-xml
- - phpcs
-
-- job-template:
name: '{name}-phpunit'
node: hasSlaveScripts && UbuntuPrecise
defaults: use-remote-zuul
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index 972a562..7ddb6fc 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -636,55 +636,14 @@
- builder:
name: phpcs
builders:
- - shell: |
- /srv/deployment/integration/phpcs/vendor/bin/phpcs -v -s . \
- --encoding=utf-8 \
-
--standard=/srv/deployment/integration/mediawiki-tools-codesniffer/MediaWiki \
- --extensions=php,inc \
- --ignore=languages/messages/Messages*.php,*.i18n.php \
- --report-checkstyle=checkstyle-phpcs.xml \
- --report-full
+ - shell: /srv/deployment/integration/slave-scripts/bin/run-phpcs-mw.sh
-# run phpcs on files changed in HEAD. Ignores:
-# - the mw/core language files
-# - any .js files
+# run phpcs on files changed in HEAD.
+# Except for Messages* and *.i18n.php (such as in installer)
- builder:
name: phpcs-HEAD
builders:
- - shell: |
-
PHPCS_FILES=$(/srv/deployment/integration/slave-scripts/bin/git-changed-in-head
php php5 inc sample)
- # No file? No point in proceeding any further (bug 44567)
- if [ -z "$PHPCS_FILES" ]; then
- echo "Skipping phpcs: no file remaining to process"
- exit 0
- fi
-
- /srv/deployment/integration/phpcs/vendor/bin/phpcs -v -s $PHPCS_FILES \
- --encoding=utf-8 \
-
--standard=/srv/deployment/integration/mediawiki-tools-codesniffer/MediaWiki \
- --ignore=languages/messages/Messages,*.i18n.php \
- --report-checkstyle=checkstyle-phpcs.xml \
- --report-full
-
-- builder:
- name: phpcs-strict
- builders:
- - shell: /srv/deployment/integration/slave-scripts/bin/run-phpcs-mw.sh
-
-- builder:
- name: phpcs-strict-HEAD
- builders:
- shell: /srv/deployment/integration/slave-scripts/bin/run-phpcs-mw.sh
HEAD
-
-- builder:
- name: phpcs-lenient
- builders:
- - shell: /srv/deployment/integration/slave-scripts/bin/run-phpcs-mw.sh
nowarnings
-
-- builder:
- name: phpcs-lenient-HEAD
- builders:
- - shell: /srv/deployment/integration/slave-scripts/bin/run-phpcs-mw.sh
nowarnings HEAD
- publisher:
name: phpcs
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 20afcfb..b97b2bc 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -1247,7 +1247,7 @@
- project:
name: 'mwext-cldr'
jobs:
- - '{name}-phpcs-strict-HEAD'
+ - '{name}-phpcs-HEAD'
- project:
name: 'mwext-CentralAuth'
@@ -1311,7 +1311,7 @@
- project:
name: 'mwext-ContentTranslation'
jobs:
- - '{name}-phpcs-strict-HEAD'
+ - '{name}-phpcs-HEAD'
- '{name}-bundle-{bundlecommand}':
bundlecommand:
- rubocop
@@ -1360,12 +1360,12 @@
- project:
name: 'mwext-Interwiki'
jobs:
- - '{name}-phpcs-strict-HEAD'
+ - '{name}-phpcs-HEAD'
- project:
name: 'mwext-LocalisationUpdate'
jobs:
- - '{name}-phpcs-strict-HEAD'
+ - '{name}-phpcs-HEAD'
- project:
name: 'mwext-Math'
@@ -1440,8 +1440,8 @@
- project:
name: 'mwext-Translate'
jobs:
- - '{name}-phpcs-strict-HEAD'
- - '{name}-phpcs-strict'
+ - '{name}-phpcs-HEAD'
+ - '{name}-phpcs'
- '{name}-bundle-{bundlecommand}':
bundlecommand:
- rubocop
@@ -1450,12 +1450,12 @@
- project:
name: 'mwext-TranslationNotifications'
jobs:
- - '{name}-phpcs-strict-HEAD'
+ - '{name}-phpcs-HEAD'
- project:
name: 'mwext-TwnMainPage'
jobs:
- - '{name}-phpcs-strict-HEAD'
+ - '{name}-phpcs-HEAD'
- '{name}-bundle-{bundlecommand}':
bundlecommand:
- rubocop
@@ -1468,7 +1468,7 @@
bundlecommand:
- rubocop
- '{name}-ruby1.9.3lint'
- - '{name}-phpcs-strict-HEAD'
+ - '{name}-phpcs-HEAD'
- project:
name: 'mwext-UploadWizard'
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 5424291..6157783 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -362,10 +362,8 @@
- 'mediawiki-core-jsduck-publish'
- 'mediawiki-core-doxygen-publish'
- '{name}-whitespaces'
- - '{name}-phpcs-lenient'
- - '{name}-phpcs-lenient-HEAD'
- - '{name}-phpcs-strict'
- - '{name}-phpcs-strict-HEAD'
+ - '{name}-phpcs'
+ - '{name}-phpcs-HEAD'
- '{name}-phplint'
- mediawiki-gate
- '{name}-phpcs-HEAD'
@@ -489,5 +487,3 @@
jobs:
- 'mediawiki-core-regression-hhvm-{branch}'
- 'mediawiki-core-regression-{branch}'
- - '{name}-phpcs'
- - '{name}-phpcs-HEAD'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 1370acf..55bfef8 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -460,27 +460,28 @@
- name: ^mwext-ZeroPortal-testextension-zend$
branch: (REL1_19|REL1_22|REL1_23|REL1_24|fundraising/REL1_23)
+ - 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
voting: true
- name: mwext-TemplateData-phpcs-HEAD
+ voting: true
+ - name: mwext-Translate-phpcs-HEAD
+ voting: true
+ - name: mwext-TranslationNotifications-phpcs-HEAD
+ voting: true
+ - name: mwext-TwnMainPage-phpcs-HEAD
+ voting: true
+ - name: mwext-UniversalLanguageSelector-phpcs-HEAD
voting: true
- name: mwext-VisualEditor-phpcs-HEAD
voting: true
- name: oojs-ui-phpcs-HEAD
voting: true
-
- # Experiment for bug 48420
- - name: ^.*phpcs-lenient(-HEAD)?$
- files:
- - '^.*\.(php|php5|phtml|inc)$'
- - name: ^.*phpcs-strict(-HEAD)?$
- files:
- - '^.*\.(php|php5|phtml|inc)$'
-
- - name: mediawiki-core-phpcs-strict-HEAD
- voting: false
- - name: mediawiki-core-phpcs-lenient-HEAD
- voting: false
- name: ^mediawiki-core-npm$
files:
@@ -1966,15 +1967,13 @@
- name: mediawiki/core
check:
- mediawiki-core-whitespaces
- - mediawiki-core-phpcs-lenient-HEAD
- - mediawiki-core-phpcs-strict-HEAD
+ - mediawiki-core-phpcs-HEAD
- mediawiki-core-jslint
- mediawiki-core-phplint
- mediawiki-core-ruby1.9.3lint
- php-composer-validate
test:
- - mediawiki-core-phpcs-lenient-HEAD
- - mediawiki-core-phpcs-strict-HEAD
+ - mediawiki-core-phpcs-HEAD
- mediawiki-core-jsduck
- mediawiki-core-npm
- mediawiki-core-phplint:
@@ -1989,8 +1988,7 @@
- php-composer-validate
gate-and-submit:
# Non voting jobs are commented out
-# - mediawiki-core-phpcs-lenient-HEAD
-# - mediawiki-core-phpcs-strict-HEAD
+# - mediawiki-core-phpcs-HEAD
- mediawiki-gate
- mediawiki-core-jsduck
- mediawiki-core-npm
@@ -2956,11 +2954,11 @@
- name: extension-gate
- name: extension-unittests
check:
- - mwext-cldr-phpcs-strict-HEAD # Experiment, bug 48420
+ - mwext-cldr-phpcs-HEAD
test:
- - mwext-cldr-phpcs-strict-HEAD # Experiment, bug 48420
+ - mwext-cldr-phpcs-HEAD
gate-and-submit:
- - mwext-cldr-phpcs-strict-HEAD # Experiment, bug 48420
+ - mwext-cldr-phpcs-HEAD
- name: mediawiki/extensions/CentralAuth
template:
@@ -3095,14 +3093,14 @@
- name: mediawiki/extensions/ContentTranslation
check:
- - mwext-ContentTranslation-phpcs-strict-HEAD # Experiment, bug 48420
+ - 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-strict-HEAD # Experiment, bug 48420
+ - mwext-ContentTranslation-phpcs-HEAD
- mwext-ContentTranslation-jslint
- mwext-ContentTranslation-lint
- mwext-ContentTranslation-bundle-rubocop
@@ -3112,7 +3110,7 @@
- php-composer-validate
gate-and-submit:
- mediawiki-gate
- - mwext-ContentTranslation-phpcs-strict-HEAD # Experiment, bug 48420
+ - mwext-ContentTranslation-phpcs-HEAD
- mwext-ContentTranslation-jslint
- mwext-ContentTranslation-lint
- mwext-ContentTranslation-bundle-rubocop
@@ -3476,13 +3474,13 @@
- name: mediawiki/extensions/Interwiki
check-only:
- - mwext-Interwiki-phpcs-strict-HEAD # Experiment, bug 48420
+ - mwext-Interwiki-phpcs-HEAD
- mwext-Interwiki-jslint
- mwext-Interwiki-lint
- php-composer-validate
gate-and-submit:
- mediawiki-gate
- - mwext-Interwiki-phpcs-strict-HEAD # Experiment, bug 48420
+ - mwext-Interwiki-phpcs-HEAD
- mwext-Interwiki-jslint
- mwext-Interwiki-lint
- php-composer-validate
@@ -5709,21 +5707,21 @@
- name: extension-rubylint
- name: extension-unittests
check:
- - mwext-Translate-phpcs-strict-HEAD # Experiment, bug 48420
+ - mwext-Translate-phpcs-HEAD
test:
- - mwext-Translate-phpcs-strict-HEAD # Experiment, bug 48420
+ - mwext-Translate-phpcs-HEAD
gate-and-submit:
- - mwext-Translate-phpcs-strict # Experiment for bug 48420
+ - mwext-Translate-phpcs-HEAD
- name: mediawiki/extensions/TranslationNotifications
template:
- name: extension-unittests
check:
- - mwext-TranslationNotifications-phpcs-strict-HEAD # Experiment, bug
48420
+ - mwext-TranslationNotifications-phpcs-HEAD
test:
- - mwext-TranslationNotifications-phpcs-strict-HEAD # Experiment, bug
48420
+ - mwext-TranslationNotifications-phpcs-HEAD
gate-and-submit:
- - mwext-TranslationNotifications-phpcs-strict-HEAD # Experiment, bug
48420
+ - mwext-TranslationNotifications-phpcs-HEAD
- name: mediawiki/extensions/Transliterator
template:
@@ -5738,11 +5736,11 @@
- name: extension-rubylint
- name: extension-unittests
check:
- - mwext-TwnMainPage-phpcs-strict-HEAD # Experiment, bug 48420
+ - mwext-TwnMainPage-phpcs-HEAD
test:
- - mwext-TwnMainPage-phpcs-strict-HEAD # Experiment, bug 48420
+ - mwext-TwnMainPage-phpcs-HEAD
gate-and-submit:
- - mwext-TwnMainPage-phpcs-strict-HEAD # Experiment, bug 48420
+ - mwext-TwnMainPage-phpcs-HEAD
- name: mediawiki/extensions/OpenBadges
template:
@@ -5758,12 +5756,12 @@
- name: extension-rubylint
- name: extension-unittests
check:
- - mwext-UniversalLanguageSelector-phpcs-strict-HEAD # Experiment, bug
48420
+ - mwext-UniversalLanguageSelector-phpcs-HEAD
test:
- - mwext-UniversalLanguageSelector-phpcs-strict-HEAD # Experiment, bug
48420
+ - mwext-UniversalLanguageSelector-phpcs-HEAD
- mwext-browsertests-UniversalLanguageSelector-phantomjs # Experiment,
bug 52120
gate-and-submit:
- - mwext-UniversalLanguageSelector-phpcs-strict-HEAD # Experiment, bug
48420
+ - mwext-UniversalLanguageSelector-phpcs-HEAD
- name: mediawiki/extensions/UploadBlacklist
template:
--
To view, visit https://gerrit.wikimedia.org/r/166071
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0eaf2085576165ba93ca3ace14284902d3731aea
Gerrit-PatchSet: 7
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
