jenkins-bot has submitted this change and it was merged.
Change subject: Bring back mwext-VisualEditor-jsduck override for submodules
......................................................................
Bring back mwext-VisualEditor-jsduck override for submodules
Follows-up ddd8d0e, 82f4c2f.
Change-Id: I46c60d5205a170a2c58e126cceac242b344a26f4
---
M jjb/job-templates.yaml
M jjb/mediawiki-extensions.yaml
M zuul/layout.yaml
3 files changed, 20 insertions(+), 2 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index 9977fec..fd1d61f 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -31,6 +31,19 @@
builders:
- jsduck
+# Deprecated non-generic jsduck job. You should use the above 'jsduck' job.
+# For repos that need to preserve workspace or have submodules, this is
+# used as workaround.
+- job-template:
+ name: '{name}-jsduck'
+ node: contintLabsSlave && UbuntuTrusty
+ defaults: use-remoteonly-zuul
+ concurrent: true
+ triggers:
+ - zuul
+ builders:
+ - npm
+
- job-template:
name: '{name}-npm'
node: contintLabsSlave && UbuntuTrusty
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index b6f8647..2912b9a 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -1142,6 +1142,11 @@
- '{name}-ruby1.9.3lint'
- project:
+ name: 'mwext-VisualEditor'
+ jobs:
+ - '{name}-jsduck'
+
+- project:
name: 'mwext-BlameMaps'
jobs:
- python-jobs
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 124e862..3be9117 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -5886,12 +5886,12 @@
- phplint
test:
- mwext-VisualEditor-npm
- - jsduck
+ - mwext-VisualEditor-jsduck
- mwext-VisualEditor-qunit-karma
gate-and-submit:
- mediawiki-gate
- mwext-VisualEditor-npm
- - jsduck
+ - mwext-VisualEditor-jsduck
- experiment-gating-dependencies
postmerge:
- mwext-VisualEditor-jsduck-publish
--
To view, visit https://gerrit.wikimedia.org/r/196491
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I46c60d5205a170a2c58e126cceac242b344a26f4
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
