Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174019
Change subject: Only use custom jshint job for parsoid-deploy repo.
......................................................................
Only use custom jshint job for parsoid-deploy repo.
Use the standard {name}-jslint job for the parsoid source repo. For the
deploy repo, we just want to check that the configuration files in
conf/*/*.js are syntax-correct, and we can't use the standard jslint
because json-lint stumbles over a broken symlink.
Change-Id: I65ab0e56f8b68d44ea81b83aad92ea029933bae2
---
M jjb/parsoidsvc.yaml
M zuul/layout.yaml
2 files changed, 12 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/19/174019/1
diff --git a/jjb/parsoidsvc.yaml b/jjb/parsoidsvc.yaml
index 78a125e..ad321e4 100644
--- a/jjb/parsoidsvc.yaml
+++ b/jjb/parsoidsvc.yaml
@@ -194,13 +194,15 @@
cd "$PARSOID_PATH"
npm test
-# slightly customized version of jshint job, since we have a package.json
-# which is a symlink, and so fails jsonlint under the usual
-# use-remote-zuul-no-submodules defaults for the {name}-jslint job
+# run jshint on the deploy repo contents --- we're primarily trying to
+# target the parsoid configuration file contents here. We can't run
+# the standard {name}-jslint job, because it doesn't check out
+# submodules and so sees package.json as a broken symlink when it
+# invokes json-lint.
- job-template:
- name: parsoidsvc-jslint
- node: contintLabsSlave && UbuntuPrecise
- defaults: use-remoteonly-zuul
+ name: parsoidsvc-deploy-jshint
+ node: hasSlaveScripts && UbuntuPrecise
+ defaults: use-remote-zuul-no-submodules
concurrent: true
triggers:
- zuul
@@ -214,10 +216,11 @@
- source # mediawiki/services/parsoid
- deploy # mediawiki/services/parsoid/deploy
jobs:
- - 'parsoidsvc-jslint'
+ - '{name}-jslint'
- '{name}-debian-glue'
- 'parsoidsvc-{repository}-parse-tool-check'
- 'parsoidsvc-{repository}-roundtrip-test-check'
- 'parsoidsvc-{repository}-npm-0.8'
- 'parsoidsvc-{repository}-npm-0.10'
+ - parsoidsvc-deploy-jshint
- parsoidsvc-php-parsertests
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 061b456..df97950 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -5109,17 +5109,15 @@
- beta-parsoid-update-eqiad
- name: mediawiki/services/parsoid/deploy
- check:
- - parsoidsvc-jslint
test:
- - parsoidsvc-jslint
+ - parsoidsvc-deploy-jshint
- parsoidsvc-debian-glue
- parsoidsvc-deploy-parse-tool-check
- parsoidsvc-deploy-roundtrip-test-check
- parsoidsvc-deploy-npm-0.8
- parsoidsvc-deploy-npm-0.10
gate-and-submit:
- - parsoidsvc-jslint
+ - parsoidsvc-deploy-jshint
- parsoidsvc-deploy-parse-tool-check
- parsoidsvc-deploy-roundtrip-test-check
- parsoidsvc-deploy-npm-0.8
--
To view, visit https://gerrit.wikimedia.org/r/174019
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I65ab0e56f8b68d44ea81b83aad92ea029933bae2
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Cscott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
