jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/324368 )
Change subject: Replace visualeditor-jsduck-jessie with npm-run-doc-jessie
template
..
Replace visualeditor-jsduck-jessie with npm-run-doc-jessie template
Follows-up a11c135fb3.
Projects should either run the generic 'jsduck' job (if no dependencies
are needed and no custom or additional commands), or use npm as 'npm install'
with 'npm run doc'. This puts the main command, e.g. 'jsduck' in the
package.json file alongside the other dependencies that the project needs.
This avoids hardcoding a relationship on one side in the repo
and on the other side in Jenkins.
This also allows one to specify predoc/postdoc tasks in package.json
which many projects use already.
This matches oojs-ui, mediawiki-core, parsoid and others.
Change-Id: Idd396f1acaec78fe49379e688bab2b759164e90b
---
M jjb/misc.yaml
M zuul/layout.yaml
2 files changed, 4 insertions(+), 15 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index 01217c6..4605d46 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -198,23 +198,12 @@
publishers:
- castor-save
-# VisualEditor has dependencies that have to be installed via npm first.
-- job:
-name: 'visualeditor-jsduck-jessie'
-node: ci-jessie-wikimedia
-defaults: use-remote-zuul-shallow-clone
-concurrent: false
-triggers:
- - zuul
-builders:
- - castor-load
- - npm-install
- - jsduck
-
- project:
name: visualeditor
jobs:
- '{name}-npm-node-4-jessie'
+- '{name}-npm-run-{script}-node-4-jessie':
+ script: 'doc'
- '{name}-rake-jessie'
- job:
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 9cd007f..33f7558 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -8947,12 +8947,12 @@
- jshint
- jsonlint
test:
- - visualeditor-jsduck-jessie
- visualeditor-npm-node-4-jessie
+ - visualeditor-npm-run-doc-node-4-jessie
- visualeditor-rake-jessie
gate-and-submit:
- - visualeditor-jsduck-jessie
- visualeditor-npm-node-4-jessie
+ - visualeditor-npm-run-doc-node-4-jessie
- visualeditor-rake-jessie
postmerge:
- visualeditor-coverage
--
To view, visit https://gerrit.wikimedia.org/r/324368
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idd396f1acaec78fe49379e688bab2b759164e90b
Gerrit-PatchSet: 4
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Krinkle
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Paladox
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
