diff --git a/modules/jenkins/files/slave_scripts/run-xmllint.sh b/modules/jenkins/files/slave_scripts/run-xmllint.sh new file mode 100755 index 0000000000..7cce7a9780 --- /dev/null +++ b/modules/jenkins/files/slave_scripts/run-xmllint.sh @@ -0,0 +1,4 @@ +#!/bin/bash -xe + +mkdir -p target/ +/usr/bin/xmllint -noent $1 'basename $1' diff --git a/modules/jenkins/manifests/slave.pp b/modules/jenkins/manifests/slave.pp index 17a62537f6..a4f7f0824a 100644 --- a/modules/jenkins/manifests/slave.pp +++ b/modules/jenkins/manifests/slave.pp @@ -39,6 +39,7 @@ class jenkins::slave( 'libmysqlclient-dev', 'libsqlite3-dev', 'libxml2-dev', + 'libxml2-utils', # for xmllint, need for wadl 'libxslt1-dev', 'maven2', 'pandoc', #for docs, markdown->docbook, bug 924507 diff --git a/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml index bebdef58b4..fe67d4a0ba 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml @@ -213,6 +213,27 @@ remove-prefix: 'openstack-compute-api-2/target/docbkx/webhelp' excludes: '**/*.xml,**/null*' +- job: + name: openstack-compute-api-v20-wadl + concurrent: false + node: precise + + triggers: + - zuul-post + + builders: + - gerrit-git-prep + - shell: /usr/local/jenkins/slave_scripts/run-xmllint.sh openstack-compute-api-2/src/os-compute-2.wadl + + publishers: + - ftp: + site: docs.openstack.org + source: 'target/**' + target: 'openstack-compute/2/wadl/' + remove-prefix: 'target/' + excludes: '**/*.xml,**/null*' + - console-log-post + # this replaces the old openstack-identity-api-doc job - job: name: identity-api-v20 diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index f49276b95e..91b6ffa605 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -804,6 +804,7 @@ projects: - gate-compute-api-merge post: - openstack-compute-api-doc + - openstack-compute-api-v20-wadl - name: openstack/identity-api check: