jenkins-bot has submitted this change and it was merged.
Change subject: Create 'puppet-doc' macro and use it
......................................................................
Create 'puppet-doc' macro and use it
Should be a no-op.
Change-Id: Ib4cdebedd7ccfd63ec5bc6452e6dcee77fe1b305
---
M jjb/macro.yaml
M jjb/mediawiki-misc.yaml
M jjb/operations-puppet.yaml
3 files changed, 20 insertions(+), 16 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index 633df57..2c23b6b 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -542,6 +542,22 @@
| xargs -n1 -t php -l
- builder:
+ name: puppet-doc
+ # Directory where 'modules' and 'manifests' directories are
+ puppet: '{puppet}'
+ 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 "$WORKSPACE/doc" \
+ --modulepath "{puppet}/modules" \
+ --manifestdir "{puppet}/manifests"
+
+- builder:
name: run-tox
builders:
- shell: |
diff --git a/jjb/mediawiki-misc.yaml b/jjb/mediawiki-misc.yaml
index f816d63..3b7346d 100644
--- a/jjb/mediawiki-misc.yaml
+++ b/jjb/mediawiki-misc.yaml
@@ -6,12 +6,8 @@
triggers:
- zuul
builders:
- - shell: |
- /usr/bin/puppet doc \
- --mode rdoc \
- --outputdir "$WORKSPACE/doc" \
- --modulepath "$WORKSPACE/puppet/modules" \
- --manifestdir "$WORKSPACE/puppet/manifests"
+ - puppet-doc:
+ puppet: "$WORKSPACE/puppet"
- doc-publish:
docsrc: 'doc'
docdest: 'mediawiki-vagrant'
diff --git a/jjb/operations-puppet.yaml b/jjb/operations-puppet.yaml
index 56c4dd5..096227c 100644
--- a/jjb/operations-puppet.yaml
+++ b/jjb/operations-puppet.yaml
@@ -34,16 +34,8 @@
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 "$WORKSPACE/doc" \
- --modulepath "modules" \
- --manifestdir "manifests"
+ - puppet-doc:
+ puppet: "$WORKSPACE"
- doc-publish:
docsrc: 'doc'
docdest: 'puppet'
--
To view, visit https://gerrit.wikimedia.org/r/204983
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4cdebedd7ccfd63ec5bc6452e6dcee77fe1b305
Gerrit-PatchSet: 9
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: JanZerebecki <jan.wikime...@zerebecki.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
