Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134840
Change subject: (WIP) Two steps rsync to publish doc (WIP)
......................................................................
(WIP) Two steps rsync to publish doc (WIP)
Work in progress. Meant for tox doc jobs for now, needs to be
generalized somehow.
Change-Id: Ia611474359eec618d8fbc1b551abc8afb504e798
---
M macro.yaml
M mediawiki-tools.yaml
M python-jobs.yaml
3 files changed, 66 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/40/134840/1
diff --git a/macro.yaml b/macro.yaml
index c7e6da1..58a09f6 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -359,7 +359,30 @@
# Ensure the destination exists
mkdir -p "$DEST_DIR/$DEST_PROJECTDIR/$DEST_VERSIONDIR/$DEST_EXTRAPATH"
# Publish it (trailing slash is important!)
- rsync --recursive --delete-after --force {src}/
"$DEST_DIR/$DEST_PROJECTDIR/$DEST_VERSIONDIR/$DEST_EXTRAPATH"
+ rsync -v --recursive --delete-after --force {src}/
"$DEST_DIR/$DEST_PROJECTDIR/$DEST_VERSIONDIR/$DEST_EXTRAPATH"
+
+# rsync {docsrc} folder to integration-publisher.eqiad.wmflabs
+# Parameters:
+# docsrc: folder containing the documentation (without trailing slash)
+- builder:
+ name: rsync-doc-stage1
+ builders:
+ - shell: |
+ rsync --recursive "{docsrc}/" "rsync://10.68.16.255/doc/$ZUUL_UUID"
+
+# rsync a folder from integration-publisher.eqiad.wmflabs to
+# /srv/org/wikimedia/doc/{docdest}
+# Parameters:
+# docdest: path under /srv/org/wikimedia/doc/
+- builder:
+ name: rsync-doc-stage2
+ builders:
+ - shell: |
+ if [ "$WMF_CI_DOC_DEST" == "" ]; then
+ echo "WMF_CI_DOC_DEST parameter is empty. Aborting"
+ exit 1
+ fi
+ rsync -v --recursive "rsync://10.68.16.255/doc/$ZUUL_UUID"/
"/srv/org/wikimedia/doc/$WMF_CI_DOC_DEST"
# Has to be named something other than 'checkstyle' or python will
# go into infinite recursion when generating the jobs.
diff --git a/mediawiki-tools.yaml b/mediawiki-tools.yaml
index da63fb3..aa92716 100644
--- a/mediawiki-tools.yaml
+++ b/mediawiki-tools.yaml
@@ -34,9 +34,13 @@
jobs:
- '{name}-tox-{toxenv}'
- '{name}-tox-doc-publish'
+ - '{name}-tox-doc-rsync':
+ docsrc: 'html'
+ docdest: 'mw-tools-releng'
- project:
name: 'mw-tools-scap'
+ docdir: 'docs/_build/html'
toxenv:
- doc
- py27
@@ -44,4 +48,7 @@
jobs:
- '{name}-tox-{toxenv}'
- '{name}-tox-doc-publish'
+ - '{name}-tox-doc-rsync':
+ docsrc: 'docs/_build/html'
+ docdest: 'mw-tools-scap'
- python-jobs
diff --git a/python-jobs.yaml b/python-jobs.yaml
index f50b18f..e9d3335 100644
--- a/python-jobs.yaml
+++ b/python-jobs.yaml
@@ -29,6 +29,41 @@
destination: '/srv/org/wikimedia/doc/{name}'
- job-template:
+ name: '{name}-tox-doc-rsync'
+ node: contintLabsSlave
+ defaults: use-remote-zuul
+ triggers:
+ - zuul
+ builders:
+ - tox:
+ venv: doc
+ - rsync-doc-stage1:
+ docsrc: '{docsrc}'
+ - trigger-builds:
+ - project: 'publish-doc'
+ block: true
+ current-parameters: true
+ predefined-parameters:
+ WMF_CI_DOC_DEST={docdest}
+
+ publishers:
+ - archive-log-dir
+
+- job:
+ name: 'publish-doc'
+ node: gallium
+
+ parameters:
+ - string:
+ name: 'WMF_CI_DOC_DEST'
+ description: 'Sub folder under /srv/org/wikimedia/doc/'
+
+ triggers:
+ - zuul
+ builders:
+ - rsync-doc-stage2
+
+- job-template:
name: '{name}-sphinx-doc'
node: hasContintPackages
defaults: use-remote-zuul
--
To view, visit https://gerrit.wikimedia.org/r/134840
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia611474359eec618d8fbc1b551abc8afb504e798
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar <has...@free.fr>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
