Krinkle has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/201694

Change subject: Publish oojs code coverage to integration.wikimedia.org
......................................................................

Publish oojs code coverage to integration.wikimedia.org

Requires I5dbd155ac9 in oojs/core.

Bug: T93558
Bug: T87490
Change-Id: I9b20a368d3941e4fddf26391e51f47d567c457f3
---
M jjb/misc.yaml
R jjb/publish.yaml
2 files changed, 43 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/94/201694/1

diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index 7b3e836..e2d1144 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -11,6 +11,7 @@
         docsrc: 'docs'
         docdest: 'unicodejs/$ZUUL_BRANCH'
 
+# TODO: Rename to oojs-core-publish
 - job:
     name: 'oojs-core-jsduck-publish'
     node: contintLabsSlave && UbuntuTrusty
@@ -19,10 +20,19 @@
     triggers:
      - zuul
     builders:
-     - jsduck
+     - npm-install
+     - shell: npm run-script doc
      - doc-publish:
         docsrc: 'docs'
         docdest: 'oojs/$ZUUL_BRANCH'
+     - shell: |
+         . /srv/deployment/integration/slave-scripts/bin/npm-set-env.sh
+         npm test
+     - cover-publish:
+        src: 'coverage'
+        dest: 'oojs'
+    publishers:
+     - global-teardown
 
 - job:
     name: 'oojs-ui-jsduck-publish'
diff --git a/jjb/doc.yaml b/jjb/publish.yaml
similarity index 79%
rename from jjb/doc.yaml
rename to jjb/publish.yaml
index 518fc31..7ec0aff 100644
--- a/jjb/doc.yaml
+++ b/jjb/publish.yaml
@@ -2,8 +2,6 @@
 # another job (executing on gallium) can pull in the files and publish them
 # on https://doc.wikimedia.org/.
 #
-# Uses $ZUUL_UUID as a unique identifier.
-#
 # Parameters:
 #
 # docsrc: Directory holding documentation files relative to workspace (without 
trailing slash)
@@ -14,7 +12,7 @@
     docsrc: '{docsrc}'
     docdest: '{docdest}'
     builders:
-     # rsync {docsrc} folder to integration-publisher.eqiad.wmflabs
+     # rsync folder to integration-publisher.eqiad.wmflabs
      - shell: |
          if [ -z $ZUUL_UUID ]; then
             echo "Error: ZUUL_UUID must be set, aborting."
@@ -31,6 +29,37 @@
            WMF_CI_PUB_DOCROOT=org/wikimedia/doc
            WMF_CI_PUB_DEST={docdest}
 
+# Sync files from a Jenkins slave in labs to a central rsync server from which
+# another job (executing on gallium) can pull in the files and publish them
+# on https://integration.wikimedia.org/cover/.
+#
+# Parameters:
+#
+# src: Directory holding documentation files relative to workspace (without 
trailing slash)
+# dest: Directory under integration.wikimedia.org/cover/
+#
+- builder:
+    name: cover-publish
+    docsrc: '{docsrc}'
+    docdest: '{docdest}'
+    builders:
+     # rsync folder to integration-publisher.eqiad.wmflabs
+     - shell: |
+         if [ -z $ZUUL_UUID ]; then
+            echo "Error: ZUUL_UUID must be set, aborting."
+            exit 1
+         fi
+         rsync --recursive "{src}/" "rsync://10.68.16.255/doc/$ZUUL_UUID"
+         echo
+         echo "Publishing to https://integration.wikimedia.org/cover/{dest}/";
+     - trigger-builds:
+       - project: publish-on-gallium
+         block: true
+         current-parameters: true  # Pass Zuul parameters
+         predefined-parameters: |
+           WMF_CI_PUB_DOCROOT=org/wikimedia/doc
+           WMF_CI_PUB_DEST=cover/{dest}
+
 # rsync a directory from integration-publisher.eqiad.wmflabs to a website on 
gallium.
 #
 # Serves:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b20a368d3941e4fddf26391e51f47d567c457f3
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to