Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/351187 )
Change subject: Remove all jsonlint references
......................................................................
Remove all jsonlint references
All repositories have been migrated to npm / grunt-jsonlint.
Remove wikimedia-fundraising-crm-jsonlint
Bug: T119973
Change-Id: I7e7c6b6a7dd6e49c1c36ffddc0da6fa3dd15fe4a
---
M jjb/job-templates.yaml
M jjb/macro.yaml
M jjb/wm-fundraising.yaml
M tests/test_zuul_scheduler.py
M zuul/layout.yaml
5 files changed, 1 insertion(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/87/351187/1
diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index a4552b4..0d75c28 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -1,15 +1,4 @@
# Generic job-templates
-
-- job-template:
- name: '{name}-jsonlint'
- node: contintLabsSlave && UbuntuTrusty
- defaults: use-remote-zuul-shallow-clone
- concurrent: true
- triggers:
- - zuul
- builders:
- - jsonlint
-
- job:
name: 'jsduck'
node: contintLabsSlave && UbuntuTrusty
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index 2f6fd7e..65715f6 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -22,11 +22,6 @@
- lint-whitespaces-in:
dir: '$WORKSPACE'
-- builder:
- name: jsonlint
- builders:
- - shell: /srv/deployment/integration/slave-scripts/bin/json-lint.php .
-
# ALWAYS pair with 'global-teardown'
- builder:
name: npm-install
diff --git a/jjb/wm-fundraising.yaml b/jjb/wm-fundraising.yaml
index 3015016..771a31a 100644
--- a/jjb/wm-fundraising.yaml
+++ b/jjb/wm-fundraising.yaml
@@ -1,7 +1,6 @@
- project:
name: wikimedia-fundraising-crm
jobs:
- - '{name}-jsonlint'
- '{name}-npm-node-6-jessie'
- '{name}-composer-{phpflavor}-{image}':
phpflavor:
diff --git a/tests/test_zuul_scheduler.py b/tests/test_zuul_scheduler.py
index b41aa54..eaaa88f 100644
--- a/tests/test_zuul_scheduler.py
+++ b/tests/test_zuul_scheduler.py
@@ -313,8 +313,7 @@
# List of jobs allowed in check* pipelines
safe_jobs = [
- '(php5[35]|json|yaml)lint',
- '.*-jsonlint',
+ '(php5[35]|yaml)lint',
'.*-(js|shell|php5[35]|)lint',
'.*-(tabs|typos)',
'.*-whitespaces',
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 9808369..5c9a58a 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -757,11 +757,6 @@
files:
- '^.*\.(js|json|css)$'
- - name: ^.*jsonlint$
- files:
- # Matches: *.json
- - '^.*\.json$'
-
- name: wikimedia-fundraising-civicrm
branch: (?!.*deployment.*|^contrib$)
--
To view, visit https://gerrit.wikimedia.org/r/351187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e7c6b6a7dd6e49c1c36ffddc0da6fa3dd15fe4a
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
