Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/254398
Change subject: Remove legacy phpcs jobs and related config
......................................................................
Remove legacy phpcs jobs and related config
All repositories have been moved to use composer as an entry point,
hence there is no need for the phpcs related material. The only
exception being mediawiki/core.
Remove all related job templates, publisher and builder macros.
Drop legacy-phpcs-HEAD project
Adjust tests
Clean out Zuul configuration
Bug: T90943
Change-Id: I8ed67e9b7f544b1198c8ef05e77422741342140d
---
M jjb/job-templates.yaml
M jjb/macro.yaml
M jjb/mediawiki-extensions.yaml
M tests/test_zuul_layout.py
M zuul/layout.yaml
5 files changed, 0 insertions(+), 117 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/98/254398/1
diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index cd7c815..1603d8e 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -273,51 +273,6 @@
builders:
- phplint
-
-# PHP CodeSniffer on everything under the workspace
-- job-template:
- name: '{name}-phpcs'
- node: contintLabsSlave && UbuntuPrecise
- defaults: use-remote-zuul-no-submodules
- concurrent: true
- triggers:
- - zuul
- builders:
- - phpcs
- publishers:
- - checkstyle-xml
- - phpcs
-
-# PHP CodeSniffer on changed files
-- job-template:
- name: '{name}-phpcs-HEAD'
- node: contintLabsSlave && UbuntuPrecise
- defaults: use-remote-zuul-shallow-clone
- concurrent: true
- triggers:
- - zuul
- builders:
- - phpcs-HEAD
- publishers:
- - checkstyle-xml
- - phpcs
-
-# mediawiki/core keeps workspace to avoid reclone
-- job-template:
- name: 'mediawiki-core-phpcs-HEAD'
- node: contintLabsSlave && UbuntuPrecise
- defaults: use-remote-zuul-no-submodules
- concurrent: true
- properties:
- - throttle-one-per-node
- triggers:
- - zuul
- builders:
- - phpcs-HEAD
- publishers:
- - checkstyle-xml
- - phpcs
-
- job:
name: 'phpunit'
node: contintLabsSlave && UbuntuPrecise
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index 85a416e..678ea8d 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -436,27 +436,6 @@
# Publish it (trailing slash is important!)
rsync --recursive --delete-after --force {src}/
"$DEST_DIR/$DEST_PROJECTDIR/$DEST_VERSIONDIR/$DEST_EXTRAPATH"
-# Has to be named something other than 'checkstyle' or python will
-# go into infinite recursion when generating the jobs.
-# JSHint considers all errors to be "high" priority except those
-# suppressed via options in jshintrc (those become "normal").
-# So we need to make sure we don't count warnings that are intentionally
-# ignored by style or convention of the repository.
-- publisher:
- name: checkstyle-xml
- publishers:
- - checkstyle:
- pattern: '**/checkstyle-*.xml'
- canRunOnFailed: true
- healthy: 0
- unHealthy: 100
- healthThreshold: 'high'
- thresholds:
- unstable:
- totalHigh: 10
- failed:
- totalHigh: 1
-
- builder:
name: mw-apply-settings
builders:
@@ -555,30 +534,6 @@
- shell: |
/srv/deployment/integration/slave-scripts/bin/git-changed-in-head php
php5 inc phtml module install \
| xargs -n1 -t php -l
-
-# run phpcs on any .php and .inc files in the workspace
-# Except for Messages* and *.i18n.php (such as in installer)
-- builder:
- name: phpcs
- builders:
- - shell: /srv/deployment/integration/slave-scripts/bin/run-phpcs-mw.sh
-
-# run phpcs on files changed in HEAD.
-# Except for Messages* and *.i18n.php (such as in installer)
-- builder:
- name: phpcs-HEAD
- builders:
- - shell: /srv/deployment/integration/slave-scripts/bin/run-phpcs-mw.sh
HEAD
-
-- publisher:
- name: phpcs
- publishers:
- - violations:
- checkstyle:
- min: 0
- max: 1
- unstable: 1
- pattern: '**/checkstyle-phpcs.xml'
# Run ruby syntax check against any file named '.rb' under the workspace.
# The ruby interpreter is passed using 'interpreter'
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 8d4c9f3..5b1e8ad 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -990,14 +990,6 @@
- mwext-ZeroBanner
- mwext-ZeroPortal
-# Deprecated, extensions should be converted
-# to use a composer entry point instead.
-- project:
- name: legacy-phpcs-HEAD
- jobs:
- - '{name}-phpcs-HEAD':
- name: []
-
- project:
name: 'mwext-CirrusSearch'
jobs:
diff --git a/tests/test_zuul_layout.py b/tests/test_zuul_layout.py
index e711ba2..f9f6f58 100644
--- a/tests/test_zuul_layout.py
+++ b/tests/test_zuul_layout.py
@@ -270,7 +270,6 @@
'(pp|erb)lint-HEAD',
'.*-(tabs|typos)',
'operations-puppet-pep8',
- '.*-phpcs-HEAD',
'.*-puppet-validate',
'.*-puppetlint-(strict|lenient)',
'(.*-)?ruby2\.0lint',
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 8ab5cd3..6f8801c 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -635,10 +635,6 @@
files:
- '^.*\.(php|php5|phtml|inc)$'
- - name: ^.*-phpcs(-HEAD)?$
- files:
- - '^.*\.(json|php|php5|phtml|inc|xml)$'
-
- name: ^mediawiki-phpunit-zend-composer$
# Release branch 1.23 does not support composer, hhvm variant is done by
the next filter
branch: (?!REL1_23)
@@ -695,10 +691,6 @@
branch: (REL1_23|REL1_24|fundraising/REL.*)
- name: ^mwext-ZeroPortal-testextension-zend$
branch: (REL1_23|REL1_24|fundraising/REL.*)
-
- # meta definition for all phpcs-HEAD jobs
- - name: ^.*-phpcs-HEAD$
- branch: ^(?!wmf/.*)$
- name: mediawiki-core-phpcs
branch: (?!^REL1_23|^REL1_24|^REL1_25|^REL1_26|^fundraising/REL)
@@ -1795,16 +1787,6 @@
- mwext-qunit
experimental:
- mwext-qunit-composer
-
- # Template for MediaWiki extensions.
- # Triggers phpcs jobs
- - name: extension-phpcs
- check:
- - 'mwext-{name}-phpcs-HEAD'
- test:
- - 'mwext-{name}-phpcs-HEAD'
- gate-and-submit:
- - 'mwext-{name}-phpcs-HEAD'
# Template for MediaWiki extensions.
# No unit tests but vote on linting.
--
To view, visit https://gerrit.wikimedia.org/r/254398
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ed67e9b7f544b1198c8ef05e77422741342140d
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
