Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/274137
Change subject: finally remove jslint from zuul and jenkins ...................................................................... finally remove jslint from zuul and jenkins Requires that these patches are merged first. https://gerrit.wikimedia.org/r/#/c/273929/ https://gerrit.wikimedia.org/r/#/c/273921/ https://gerrit.wikimedia.org/r/#/c/273928/ https://gerrit.wikimedia.org/r/#/c/273932/ :) Bug: T127362 Change-Id: Ie45810894e465983503f8b91265e810cf4bf5962 --- M jjb/job-templates.yaml M tests/test_zuul_scheduler.py M zuul/layout.yaml 3 files changed, 2 insertions(+), 20 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/37/274137/1 diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml index ed0ddfd..dbbbef6 100644 --- a/jjb/job-templates.yaml +++ b/jjb/job-templates.yaml @@ -12,19 +12,6 @@ /srv/deployment/integration/slave-scripts/bin/git-changed-in-head erb \ | xargs -n1 -I {} -t sh -c 'erb -P -x -T - {} | ruby -c' -# Non-generic version of "jshint" and "jsonlint" -# below. -- job-template: - name: '{name}-jslint' - node: contintLabsSlave && UbuntuTrusty - defaults: use-remote-zuul-no-submodules - concurrent: true - triggers: - - zuul - builders: - - jshint - - jsonlint - - job: name: 'jshint' node: contintLabsSlave && UbuntuTrusty diff --git a/tests/test_zuul_scheduler.py b/tests/test_zuul_scheduler.py index 2835338..eb6a956 100644 --- a/tests/test_zuul_scheduler.py +++ b/tests/test_zuul_scheduler.py @@ -285,7 +285,7 @@ safe_jobs = [ '(php5[35]|perl|json|yaml)lint', 'jshint', - '.*-(js|perl|shell|php5[35]|)lint', + '.*-(perl|shell|php5[35]|)lint', '(pp|erb)lint-HEAD', '.*-(tabs|typos)', 'operations-puppet-pep8', diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 8cf36d0..e008580 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -731,11 +731,6 @@ files: - '^.*\.(js|json|css)$' - - name: ^.*-jslint$ - files: - # Matches: .jscsrc, .jshintrc, .jshintignore, *.js and *.json - - '^(\.js.*|.*\.(js|json)$)' - - name: ^jshint$ files: # Matches: .jscsrc, .jshintrc, .jshintignore, and *.js @@ -1084,7 +1079,7 @@ gate-and-submit: - jsduck - # Similar to above, but no jslint. + # Similar to above, but no jshint. - name: mw-checks check-voter: - php53lint -- To view, visit https://gerrit.wikimedia.org/r/274137 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie45810894e465983503f8b91265e810cf4bf5962 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
