jenkins-bot has submitted this change and it was merged.
Change subject: Convert 'mediawiki-vagrant-puppet-doc' job to run on a labs
slave
......................................................................
Convert 'mediawiki-vagrant-puppet-doc' job to run on a labs slave
Use the doc-publish macro. To have DOC_SUBPATH set by the Zuul
set_doc_subpath() python method, suffix the job name -publish thus
renaming it.
Bug: T86659
Change-Id: Idf7e5b1f39d139c260ae0e7cb52436469e08c744
---
M jjb/mediawiki-misc.yaml
M zuul/layout.yaml
2 files changed, 9 insertions(+), 6 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/mediawiki-misc.yaml b/jjb/mediawiki-misc.yaml
index 68938e9..afe974e 100644
--- a/jjb/mediawiki-misc.yaml
+++ b/jjb/mediawiki-misc.yaml
@@ -10,9 +10,9 @@
artifacts: '*.gem'
- job-template:
- name: 'mediawiki-vagrant-puppet-doc'
- node: gallium # webhost where doc is published
- defaults: use-remote-zuul
+ name: 'mediawiki-vagrant-puppet-doc-publish'
+ node: contintLabsSlave && UbuntuPrecise
+ defaults: use-remoteonly-zuul
concurrent: false
triggers:
- zuul
@@ -20,9 +20,12 @@
- shell: |
/usr/bin/puppet doc \
--mode rdoc \
- --outputdir /srv/org/wikimedia/doc/mediawiki-vagrant \
+ --outputdir "$WORKSPACE/doc" \
--modulepath "$WORKSPACE/puppet/modules" \
--manifestdir "$WORKSPACE/puppet/manifests"
+ - doc-publish:
+ docsrc: 'doc'
+ docdest: 'mediawiki-vagrant'
- project:
name: 'mediawiki-ruby-api'
@@ -51,7 +54,7 @@
- '{name}-puppetlint-lenient'
- '{name}-puppetlint-strict'
- '{name}-puppet-validate'
- - 'mediawiki-vagrant-puppet-doc'
+ - 'mediawiki-vagrant-puppet-doc-publish'
- '{name}-bundle17-yard-publish'
- project:
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 03e26b8..a2f23ae 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2549,7 +2549,7 @@
- mediawiki-vagrant-puppetlint-strict
- mediawiki-vagrant-puppet-validate
postmerge:
- - mediawiki-vagrant-puppet-doc
+ - mediawiki-vagrant-puppet-doc-publish
- mediawiki-vagrant-bundle17-yard-publish
experimental:
- bundle17-rubocop
--
To view, visit https://gerrit.wikimedia.org/r/204980
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idf7e5b1f39d139c260ae0e7cb52436469e08c744
Gerrit-PatchSet: 4
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[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
