jenkins-bot has submitted this change and it was merged.
Change subject: Convert 'operations-puppet-doc' job to run on a labs slave
......................................................................
Convert 'operations-puppet-doc' job to run on a labs slave
Using the doc-publish macro
Bug: T86659
Bug: T96576
Change-Id: Id515740b6ffb1b75f4eee5b90751bcce36f2e94a
---
M jjb/operations-puppet.yaml
1 file changed, 28 insertions(+), 5 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/operations-puppet.yaml b/jjb/operations-puppet.yaml
index 3da604b..0a96efc 100644
--- a/jjb/operations-puppet.yaml
+++ b/jjb/operations-puppet.yaml
@@ -41,20 +41,43 @@
# Documentation for our puppet repository
- job-template:
name: 'operations-puppet-doc'
- node: gallium # webhost where doc is published
+ node: contintLabsSlave && UbuntuPrecise
defaults: use-remoteonly-zuul
concurrent: false # dont want to race doc creation!
triggers:
- zuul
- workspace: '/srv/org/wikimedia/doc/puppetsource'
+ scm:
+ - git:
+ url: '$ZUUL_URL/$ZUUL_PROJECT'
+ basedir: 'src'
+ branches:
+ - '$ZUUL_COMMIT'
+ refspec: '$ZUUL_REF'
+ wipe-workspace: false
+ clean:
+ after: true
+ submodule:
+ disable: false
+ recursive: true
builders:
- shell: |
+ # Destination dir must not exist or 'puppet doc' complains
+ rm -fR "$WORKSPACE/doc"
+
+ cd "$WORKSPACE/src"
/usr/bin/puppet doc \
--mode rdoc \
- --outputdir /srv/org/wikimedia/doc/puppet \
- --modulepath "$WORKSPACE/modules" \
- --manifestdir "$WORKSPACE/manifests"
+ --outputdir "$WORKSPACE/doc" \
+ --modulepath "modules" \
+ --manifestdir "manifests"
+ - doc-publish:
+ docsrc: 'doc'
+ docdest: 'puppet'
+ # And publish the entire workspace as "puppetsource"
+ - doc-publish:
+ docsrc: 'src'
+ docdest: 'puppetsource'
# Find out common typos in any files of ops/puppet
- job-template:
--
To view, visit https://gerrit.wikimedia.org/r/204982
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id515740b6ffb1b75f4eee5b90751bcce36f2e94a
Gerrit-PatchSet: 8
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
