Krinkle has uploaded a new change for review.

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

Change subject: doc: Rename builder macros around doc-publish
......................................................................

doc: Rename builder macros around doc-publish

Change-Id: I241fab318de487ad2f748c35f3b33ff76380d78e
---
M jjb/doc.yaml
M jjb/mediawiki.yaml
M jjb/python-jobs.yaml
M jjb/ruby-jobs.yaml
M jjb/search.yaml
5 files changed, 9 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/97/187797/1

diff --git a/jjb/doc.yaml b/jjb/doc.yaml
index 0c457ec..10562fc 100644
--- a/jjb/doc.yaml
+++ b/jjb/doc.yaml
@@ -1,8 +1,6 @@
-# builder: push-doc
-#
 # 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
-# under https://doc.wikimedia.org/.
+# on https://doc.wikimedia.org/.
 #
 # Uses $ZUUL_UUID as a unique identifier.
 #
@@ -12,7 +10,7 @@
 # docdest: Directory under doc.wikimedia.org/
 #
 - builder:
-    name: push-doc
+    name: doc-publish
     docsrc: '{docsrc}'
     docdest: '{docdest}'
     builders:
@@ -24,9 +22,8 @@
             exit 1
          fi
          rsync --recursive "{docsrc}/" "rsync://10.68.16.255/doc/$ZUUL_UUID"
-     # rsync folder to doc.wikimedia.org
      - trigger-builds:
-       - project: 'publish-doc'
+       - project: doc-publish-sync
          block: true
          current-parameters: true  # Pass Zuul parameters
          predefined-parameters:
@@ -37,8 +34,8 @@
 #
 # Uses $ZUUL_UUID as a unique identifier.
 - job:
-    name: 'publish-doc'
-    node: gallium  # hosts doc.wikimedia.org
+    name: doc-publish-sync
+    node: gallium # hosts doc.wikimedia.org
 
     parameters:
      - string:
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index d99a551..000df85 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -122,7 +122,7 @@
          rm -fR build/doc
          mkdir -p build/doc
          TARGET_BASEDIR="$WORKSPACE/build/doc" 
/srv/deployment/integration/slave-scripts/tools/mwcore-docgen.sh
-     - push-doc:
+     - doc-publish:
          docsrc: 'build/doc'
          docdest: 'mediawiki-core/$DOC_SUBPATH/php'
 
diff --git a/jjb/python-jobs.yaml b/jjb/python-jobs.yaml
index cf6d11f..563d72e 100644
--- a/jjb/python-jobs.yaml
+++ b/jjb/python-jobs.yaml
@@ -50,7 +50,7 @@
     builders:
      - tox:
          venv: doc
-     - push-doc:
+     - doc-publish:
         docsrc: '{docsrc}'
         docdest: '{docdest}'
 
diff --git a/jjb/ruby-jobs.yaml b/jjb/ruby-jobs.yaml
index 0fb8c54..5b0b7b3 100644
--- a/jjb/ruby-jobs.yaml
+++ b/jjb/ruby-jobs.yaml
@@ -38,6 +38,6 @@
     builders:
      - bundle:
          command: 'yard'
-     - push-doc:
+     - doc-publish:
          docsrc: 'doc'
          docdest: 'rubygems/{name}'
diff --git a/jjb/search.yaml b/jjb/search.yaml
index b0f4cc3..7eff054 100644
--- a/jjb/search.yaml
+++ b/jjb/search.yaml
@@ -49,7 +49,7 @@
     maven:
       goals: clean javadoc:javadoc
     postbuilders:
-     - push-doc:
+     - doc-publish:
          docsrc: 'target/site/apidocs'
          docdest: 'search-extra'
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I241fab318de487ad2f748c35f3b33ff76380d78e
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