From c0213ef7b6ae1099146c02962392c2b41256f4ee Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Mon, 18 Feb 2013 01:37:14 +0000 Subject: [PATCH] Add gate-openstack-manuals-validate job. * modules/jenkins/manifests/params.pp: Define $python_lxml_package names for both RHEL and Ubuntu. * modules/jenkins/manifests/slave.pp: Install Python bindings for libxml2 and libxslt, needed by the tools/validate.py script in the openstack/openstack-manuals project. * .../jenkins_job_builder/config/manuals.yaml (gate-openstack-manuals-validate) New job to run tools/validate.py for openstack/openstack-manuals project changes. * ... /zuul/layout.yaml(jobs): Set gate-openstack-manuals-validate as non-voting. (openstack/openstack-manuals): Add gate-openstack-manuals-validate to run on check and gate pipelines. Change-Id: I0f43834dc25fa41488f795fcf1526c9b0d031a5f Reviewed-on: https://review.openstack.org/22156 Reviewed-by: Lorin Hochstein Reviewed-by: Giampaolo Lauria Reviewed-by: Khai Do Reviewed-by: James E. Blair Reviewed-by: Clark Boylan Approved: Clark Boylan Tested-by: Jenkins --- modules/jenkins/manifests/params.pp | 2 ++ modules/jenkins/manifests/slave.pp | 1 + .../files/jenkins_job_builder/config/manuals.yaml | 14 ++++++++++++++ modules/openstack_project/files/zuul/layout.yaml | 4 ++++ 4 files changed, 21 insertions(+) diff --git a/modules/jenkins/manifests/params.pp b/modules/jenkins/manifests/params.pp index 21254edb77..74df64dd52 100644 --- a/modules/jenkins/manifests/params.pp +++ b/modules/jenkins/manifests/params.pp @@ -34,6 +34,7 @@ class jenkins::params { $pkgconfig_package = 'pkgconfig' $pyflakes_package = 'pyflakes' $python_libvirt_package = 'libvirt-python' + $python_lxml_package = 'python-lxml' $python_zmq_package = 'python-zmq' # FIXME: No Python3 packages on RHEL #$python3_dev_package = 'python3-devel' @@ -74,6 +75,7 @@ class jenkins::params { $pkgconfig_package = 'pkg-config' $pyflakes_package = 'pyflakes' $python_libvirt_package = 'python-libvirt' + $python_lxml_package = 'python-lxml' $python_zmq_package = 'python-zmq' $python3_dev_package = 'python3-all-dev' $rubygems_package = 'rubygems' diff --git a/modules/jenkins/manifests/slave.pp b/modules/jenkins/manifests/slave.pp index 5fc4e5901e..9d0337bc88 100644 --- a/modules/jenkins/manifests/slave.pp +++ b/modules/jenkins/manifests/slave.pp @@ -47,6 +47,7 @@ class jenkins::slave( $::jenkins::params::pkgconfig_package, # for spidermonkey, used by ceilometer $::jenkins::params::pyflakes_package, $::jenkins::params::python_libvirt_package, + $::jenkins::params::python_lxml_package, # for validating openstack manuals $::jenkins::params::python_zmq_package, # zeromq unittests (not pip installable) $::jenkins::params::rubygems_package, $::jenkins::params::sqlite_package, diff --git a/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml b/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml index daeeeefa08..ab2275487e 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml @@ -27,6 +27,20 @@ keep-hierarchy: true copy-after-failure: true +- job: + name: gate-openstack-manuals-validate + node: precise + + triggers: + - zuul + + builders: + - gerrit-git-prep + - shell: "./tools/validate.py" + + publishers: + - console-log + - job: name: openstack-cli-guide project-type: maven diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 5fd7e5bab4..7bd8664eef 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -105,6 +105,8 @@ jobs: - name: gate-openstack-cli-guide success-pattern: http://docs-draft.openstack.org/{job.name}/{pipeline.name}/{build.number}/cli/quick-start branch: ^(?!stable/(diablo|essex)).*$ + - name: gate-openstack-manuals-validate + voting: false projects: @@ -1007,8 +1009,10 @@ projects: - name: openstack/openstack-manuals check: - gate-openstack-cli-guide + - gate-openstack-manuals-validate gate: - gate-openstack-cli-guide + - gate-openstack-manuals-validate post: - openstack-admin-manual-compute - openstack-admin-manual-keystone-diablo