Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/350129 )
Change subject: Remove mwgate-jshint
......................................................................
Remove mwgate-jshint
MediaWiki repositories now run jshint or eslint with npm.
Remove the Zuul template and the job from JJB.
Change-Id: I7912c6a1fdc1be6a7c036c23abfa0be13d5b5546
---
M jjb/job-templates.yaml
M jjb/mediawiki.yaml
M tests/test_zuul_layout.py
M zuul/layout.yaml
4 files changed, 1 insertion(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/29/350129/1
diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index 324d79d..5826639 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -10,13 +10,6 @@
builders:
- jshint
-- job-template:
- !!merge : *job_jshint
- name: '{name}-jshint'
- # Reinject Zuul parameters since JJB strip for some reason
- triggers:
- - zuul
-
- job: &job_jsonlint
name: 'jsonlint'
node: contintLabsSlave && UbuntuTrusty
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 5ab26ec..39e8ea2 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -284,7 +284,6 @@
- '{name}-composer-{phpflavor}-{image}': *phpflavor_images
- '{name}-composer-validate'
- '{name}-jsduck'
- - '{name}-jshint'
- '{name}-jsonlint'
- '{name}-php55lint'
- '{name}-rake-jessie'
diff --git a/tests/test_zuul_layout.py b/tests/test_zuul_layout.py
index a507647..0e4a796 100644
--- a/tests/test_zuul_layout.py
+++ b/tests/test_zuul_layout.py
@@ -66,17 +66,13 @@
templates = [
t['name'] for t in project.get('template', {})
if t['name'] in (
- 'mwgate-jshint',
'mwgate-jsonlint',
'mwgate-npm',
)
]
self.assertFalse(
'mwgate-npm' in templates
- and (
- 'mwgate-jsonlint' in templates
- or 'mwgate-jshint' in templates
- ),
+ and 'mwgate-jsonlint' in templates,
'Project %s in Zuul should not have jsonlint/jshint '
'(already has npm)'
% project['name']
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index b8fc437..0e8fa68 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1102,14 +1102,6 @@
gate-and-submit:
- jshint
- - name: mwgate-jshint
- check:
- - mwgate-jshint
- test:
- - mwgate-jshint
- gate-and-submit:
- - mwgate-jshint
-
- name: jsonlint
check:
- jsonlint
--
To view, visit https://gerrit.wikimedia.org/r/350129
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7912c6a1fdc1be6a7c036c23abfa0be13d5b5546
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