Use Jenkins Job Builder to config ci-docs job.
The existing ci-docs job is a one off job that was configured by hand. Define the ci-docs job as a Jenkins Job Builder job using the existing project-docs utilities. To make the existing utilities work within the puppet repo the doc files have been moved to doc/source, setup.cfg added to build docs in the new dir, setup.py builds openstack-ci-puppet (instead of nova), tox now has a venv virtualenv, and the .gitignore has been updated appropriately. Change-Id: Ic0f291af181b4ef8eff62c5ec7cf3ccfa5b79800 Reviewed-on: https://review.openstack.org/13729 Approved: James E. Blair <corvus@inaugust.com> Reviewed-by: James E. Blair <corvus@inaugust.com> Tested-by: Jenkins
This commit is contained in:
parent
84b7f665a1
commit
607b2db8c7
5
.gitignore
vendored
5
.gitignore
vendored
@ -2,7 +2,8 @@
|
||||
*~
|
||||
*.pyc
|
||||
applytest
|
||||
build/
|
||||
doc/html/
|
||||
doc/build/
|
||||
manifests/secrets.pp
|
||||
.tox/
|
||||
openstack_ci_puppet.egg-info/
|
||||
|
||||
|
@ -42,3 +42,25 @@
|
||||
|
||||
publishers:
|
||||
- console-log
|
||||
|
||||
|
||||
# This is a non-standard docs job because it uses SCP instead of FTP
|
||||
- job:
|
||||
name: ci-docs
|
||||
node: precise
|
||||
|
||||
triggers:
|
||||
- zuul-post
|
||||
|
||||
builders:
|
||||
- gerrit-git-prep
|
||||
- docs
|
||||
|
||||
publishers:
|
||||
- scp:
|
||||
site: '173.203.107.207'
|
||||
files:
|
||||
- target: 'ci'
|
||||
source: 'doc/build/html/**/*'
|
||||
keep-hierarchy: true
|
||||
- console-log-post
|
||||
|
@ -188,6 +188,8 @@ projects:
|
||||
- gate-ci-puppet-merge:
|
||||
- gate-ci-puppet-syntax
|
||||
- gate-ci-puppet-lint
|
||||
post:
|
||||
- ci-docs
|
||||
|
||||
- name: openstack-ci/puppet-apparmor
|
||||
check:
|
||||
|
4
setup.cfg
Normal file
4
setup.cfg
Normal file
@ -0,0 +1,4 @@
|
||||
[build_sphinx]
|
||||
all_files = 1
|
||||
build-dir = doc/build
|
||||
source-dir = doc/source
|
2
setup.py
2
setup.py
@ -16,7 +16,7 @@ try:
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
setup(name='nova',
|
||||
setup(name='openstack-ci-puppet',
|
||||
version="%d.%02d" % (datetime.datetime.now().year,
|
||||
datetime.datetime.now().month),
|
||||
description="OpenStack Continuous Integration Scripts",
|
||||
|
Loading…
x
Reference in New Issue
Block a user