jenkins-bot has submitted this change and it was merged.
Change subject: Revert "Publish scap docs without $ZUUL_UUID"
......................................................................
Revert "Publish scap docs without $ZUUL_UUID"
This reverts commit 017288a14b719afd6c5cb7e406bd91e50ac9c979.
Change-Id: Ibd53de7639b5f5312495e7507bf016b9e16af66e
---
M jjb/mediawiki-tools.yaml
M jjb/publish.yaml
2 files changed, 19 insertions(+), 39 deletions(-)
Approvals:
Dduvall: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/mediawiki-tools.yaml b/jjb/mediawiki-tools.yaml
index dfdceb3..deb8285 100644
--- a/jjb/mediawiki-tools.yaml
+++ b/jjb/mediawiki-tools.yaml
@@ -5,24 +5,12 @@
docsrc: 'html'
docdest: 'mw-tools-releng'
-# Job that updates scap docs on doc.wikimedia.org hourly
-- job:
- name: 'mw-tools-scap-tox-doc-publish'
- node: contintLabsSlave && UbuntuPrecise
- triggers:
- - pollscm: '@hourly'
- scm:
- - git:
- url: 'https://phabricator.wikimedia.org/diffusion/MSCA/scap'
- branches:
- - 'origin/master'
- wipe-workspace: true
- builders:
- - tox:
- venv: doc
- - doc-publish:
- docsrc: 'docs/_build/html'
- docdest: 'mw-tools-scap'
+- project:
+ name: 'mw-tools-scap'
+ jobs:
+ - '{name}-tox-doc-publish':
+ docsrc: 'docs/_build/html'
+ docdest: 'mw-tools-scap'
# Job to run MW-CS patchsets against
# mediwiki/core's includes/ directory for easier
diff --git a/jjb/publish.yaml b/jjb/publish.yaml
index 3a93f6b..86dd5b3 100644
--- a/jjb/publish.yaml
+++ b/jjb/publish.yaml
@@ -14,9 +14,8 @@
- shell: |
set -u
echo "Making sure that destination does not contain unset variables
(like DOC_SUBPATH, see zuul/doc_functions.py): {docdest}"
- UUID=$(cat /proc/sys/kernel/random/uuid)
- [ $UUID ]
- rsync --recursive "{docsrc}/" "rsync://10.68.16.255/doc/$UUID"
+ [ $ZUUL_UUID ]
+ rsync --recursive "{docsrc}/" "rsync://10.68.16.255/doc/$ZUUL_UUID"
echo
echo "Publishing to https://doc.wikimedia.org/{docdest}/";
- trigger-builds:
@@ -26,7 +25,6 @@
predefined-parameters: |
WMF_CI_PUB_DOCROOT=org/wikimedia/doc
WMF_CI_PUB_DEST={docdest}
- UUID=$UUID
# 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
@@ -44,9 +42,8 @@
- shell: |
set -u
echo "Making sure that destination does not contain unset variables
(like DOC_SUBPATH, see zuul/doc_functions.py): {dest}"
- UUID=$(cat /proc/sys/kernel/random/uuid)
- [ $UUID ]
- rsync --recursive "{src}/" "rsync://10.68.16.255/doc/$UUID"
+ [ $ZUUL_UUID ]
+ rsync --recursive "{src}/" "rsync://10.68.16.255/doc/$ZUUL_UUID"
echo
echo "Publishing to https://integration.wikimedia.org/cover/{dest}/";
- trigger-builds:
@@ -56,7 +53,6 @@
predefined-parameters: |
WMF_CI_PUB_DOCROOT=org/wikimedia/integration
WMF_CI_PUB_DEST=cover/{dest}
- UUID=$UUID
# rsync a directory from integration-publisher.eqiad.wmflabs to a website on
gallium.
#
@@ -70,7 +66,7 @@
# * docroot: org/wikimedia/integration
# * dest: cover/PROJECT
#
-# Uses $UUID as a unique identifier.
+# Uses $ZUUL_UUID as a unique identifier.
- job:
name: publish-on-gallium
node: gallium
@@ -88,21 +84,17 @@
# WILL be auto-created if non-existent.
name: 'WMF_CI_PUB_DEST'
description: 'Sub directory path under the chosen document root, such
as "mediawiki-core/DOC_SUBPATH/js"'
- - string:
- # Passed from upstream jobs
- name: 'UUID'
- description: 'Directory on integration-publisher/doc rsync server
from which generated documentation is fetched'
triggers:
- zuul
builders:
- shell: |
set -u
- echo "Publishing $WMF_CI_PUB_DEST from labs to prod"
- echo "UUID: $UUID"
+ echo "Publishing $ZUUL_PROJECT from labs to prod"
+ echo "Zuul UUID: $ZUUL_UUID"
echo "..."
- [ $UUID ]
+ [ $ZUUL_UUID ]
LOCAL_DOCROOT="/srv/$WMF_CI_PUB_DOCROOT"
if [ ! -d $LOCAL_DOCROOT ]; then
echo "Error: Invalid docroot. Directory $LOCAL_DOCROOT must exist,
aborting."
@@ -110,7 +102,7 @@
fi
LOCAL_DEST="$LOCAL_DOCROOT/$WMF_CI_PUB_DEST"
mkdir -p "$LOCAL_DEST"
- rsync --recursive --delete-after "rsync://10.68.16.255/doc/$UUID"/
"$LOCAL_DEST"
+ rsync --recursive --delete-after
"rsync://10.68.16.255/doc/$ZUUL_UUID"/ "$LOCAL_DEST"
LOCAL_VHOST=$(echo $WMF_CI_PUB_DOCROOT | awk -F'/' '{ print
$3"."$2"."$1 }')
echo
@@ -120,18 +112,18 @@
builders:
- shell: |
set -u
- [ $UUID ]
+ [ $ZUUL_UUID ]
echo "Removing directory from publishing instance..."
- rm -rf "$UUID"
+ rm -rf "$ZUUL_UUID"
# The trick here is that the local side of the rsync does not
# have the content at all at the time of sync. Rsync expands
- # `--include="$UUID/***"` to mean the directory and all of
+ # `--include="$ZUUL_UUID/***"` to mean the directory and all of
# it's contents followed by the exclusion of all files not
# explicitly included. Without the three wildcards rsync will not
# touch the named directory itself.
#
# -- Bryan "bd808" Davis
- rsync --delete --recursive --include="$UUID/***" --exclude="*" .
rsync://10.68.16.255/doc
+ rsync --delete --recursive --include="$ZUUL_UUID/***"
--exclude="*" . rsync://10.68.16.255/doc
# Options are confusing, setting them both to false ensures the
# postbuildscript is ALWAYS run.
--
To view, visit https://gerrit.wikimedia.org/r/251160
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd53de7639b5f5312495e7507bf016b9e16af66e
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Thcipriani <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
