jenkins-bot has submitted this change and it was merged.

Change subject: Build Parsoid docs on jessie
......................................................................


Build Parsoid docs on jessie

 * Follow up to d960e190

 * node v0.10 is no longer maintained

Change-Id: Iebfe35a4eed25da71cddde16dc41dd5d54f00e9d
---
M jjb/parsoidsvc.yaml
M zuul/layout.yaml
2 files changed, 21 insertions(+), 22 deletions(-)

Approvals:
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/jjb/parsoidsvc.yaml b/jjb/parsoidsvc.yaml
index 3eb3a08..713611a 100644
--- a/jjb/parsoidsvc.yaml
+++ b/jjb/parsoidsvc.yaml
@@ -128,32 +128,31 @@
      - archive-log-allow-empty
      - castor-save
 
-# documentation builder (based on `oojs-ui-jsduck-publish` job)
 - job-template:
-    name: parsoidsvc-{repository}-jsduck-publish
-    node: ci-trusty-wikimedia  # Trusty has jsduck.deb
-    defaults: use-remoteonly-zuul
+    name: parsoidsvc-{repository}-jsduck-publish-jessie
+    node: ci-jessie-wikimedia
+    defaults: use-remote-zuul-shallow-clone
     concurrent: false
     triggers:
      - zuul
     builders:
-    - assert-node-version-0.10
-    - castor-load
-    - setup-npm-oid:
-        repository: '{repository}'
-    - shell: |
-        node --version
-        npm --version
-        set -e
-        . npm-oid.env
-        ln -s "$NPM_SET_PATH/docs" generated-docs
-        cd "$NPM_SET_PATH"
-        npm run doc
-    - doc-publish:
-        docsrc: 'generated-docs'
-        docdest: 'Parsoid/$DOC_SUBPATH'
+     - assert-node-version-4
+     - castor-load
+     - setup-npm-oid:
+         repository: '{repository}'
+     - shell: |
+         node --version
+         npm --version
+         set -e
+         . npm-oid.env
+         ln -s "$NPM_SET_PATH/docs" generated-docs
+         cd "$NPM_SET_PATH"
+         npm run doc
+     - doc-publish:
+         docsrc: 'generated-docs'
+         docdest: 'Parsoid/$DOC_SUBPATH'
     publishers:
-    - castor-save
+     - castor-save
 
 - project:
     name: parsoidsvc
@@ -167,7 +166,7 @@
         - 'parsoidsvc-{repository}-parse-tool-check-jessie'
         - 'parsoidsvc-{repository}-roundtrip-test-check-jessie'
         - 'parsoidsvc-{repository}-npm-node-4-jessie'
-        - 'parsoidsvc-{repository}-jsduck-publish':
+        - 'parsoidsvc-{repository}-jsduck-publish-jessie':
             # We only publish doc of the 'source' repo
             repository:
                 - source
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 8309851..d73f193 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -7263,7 +7263,7 @@
       - parsoidsvc-source-roundtrip-test-check-jessie
       - parsoidsvc-source-npm-node-4-jessie
     postmerge:
-      - parsoidsvc-source-jsduck-publish
+      - parsoidsvc-source-jsduck-publish-jessie
 
   - name: mediawiki/services/parsoid/deploy
     test:

-- 
To view, visit https://gerrit.wikimedia.org/r/319114
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iebfe35a4eed25da71cddde16dc41dd5d54f00e9d
Gerrit-PatchSet: 3
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Arlolra <abrea...@wikimedia.org>
Gerrit-Reviewer: Arlolra <abrea...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Subramanya Sastry <ssas...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to