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

Change subject: Update mediawiki-core jobs to use standard jsduck
......................................................................


Update mediawiki-core jobs to use standard jsduck

The mediawiki-core-jsduck-publish job was failing trying to
remove a symlink that no longer exists.

Change-Id: I12829ab055cce58604b1f93a309298a87d63e282
---
M jjb/mediawiki.yaml
1 file changed, 9 insertions(+), 18 deletions(-)

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



diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 415f9db..f7b4316 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -75,33 +75,24 @@
     triggers:
      - zuul
     builders:
-     - shell: |
-        $WORKSPACE/maintenance/mwjsduck-gen --version "$ZUUL_BRANCH"
+     - jsduck
 
 - job:
     name: 'mediawiki-core-jsduck-publish'
-    node: gallium
-    defaults: use-zuul
+    node: contintLabsSlave && UbuntuTrusty
+    defaults: use-remote-zuul-no-submodules
     concurrent: false
     logrotate:
         daysToKeep: 15
-    scm:
-     - git-mwcore
     triggers:
      - zuul
     builders:
-     - shell: |
-        $WORKSPACE/maintenance/mwjsduck-gen --version "$ZUUL_BRANCH"
-        # Substitute symlink with complete copy since we only publish
-        # the docs/js directory. Have to remove the symlink manually
-        # as otherwise the rsync operation is a no-op (T86864).
-        rm $WORKSPACE/docs/js/modules
-        rsync --recursive --delete-after --force $WORKSPACE/resources/ 
$WORKSPACE/docs/js/modules/
-     - documentation-sync-subdir:
-        src: '$WORKSPACE/docs/js'
-        project: 'mediawiki-core'
-        version: '$ZUUL_BRANCH'
-        subdir: 'js/'
+     - assert-env-doc_subpath
+     - npm-install
+     - shell: npm run-script doc
+     - doc-publish:
+        docsrc: 'docs/js'
+        docdest: 'mediawiki-core/$DOC_SUBPATH/js'
 
 - job:
     name: 'mediawiki-core-doxygen-publish'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I12829ab055cce58604b1f93a309298a87d63e282
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
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