From b3fb4654ddd3b8aaba35244ff8aa7cfabb1fbcc6 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Thu, 27 Sep 2012 14:45:38 -0700 Subject: [PATCH] Add api merge jobs. Change-Id: I020b61e7dcd18ff31c7ccaf8664ec29f95df9f40 Reviewed-on: https://review.openstack.org/13795 Approved: James E. Blair Reviewed-by: James E. Blair Tested-by: Jenkins --- .../jenkins_job_builder/config/api-jobs.yaml | 4 ++ .../jenkins_job_builder/config/projects.yaml | 59 ++++++++++++++++++- .../openstack_project/files/zuul/layout.yaml | 30 ++++++++-- 3 files changed, 88 insertions(+), 5 deletions(-) create mode 100644 modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml 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 new file mode 100644 index 0000000000..666fcb1ef0 --- /dev/null +++ b/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml @@ -0,0 +1,4 @@ +- job-group: + name: api-jobs + jobs: + - gate-{name}-merge diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml index a56a6abf6b..3f708f8956 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -19,6 +19,17 @@ - openstack-publish-jobs +- project: + name: compute-api + github-org: openstack + node: precise + tarball-publisher-site: nova.openstack.org + doc-publisher-site: docs.openstack.org + + jobs: + - api-jobs + + - project: name: devstack-gate github-org: openstack-ci @@ -130,6 +141,28 @@ - openstack-publish-jobs +- project: + name: identity-api + github-org: openstack + node: precise + tarball-publisher-site: nova.openstack.org + doc-publisher-site: docs.openstack.org + + jobs: + - api-jobs + + +- project: + name: image-api + github-org: openstack + node: precise + tarball-publisher-site: nova.openstack.org + doc-publisher-site: docs.openstack.org + + jobs: + - api-jobs + + - project: name: jenkins-job-builder github-org: openstack-ci @@ -173,13 +206,26 @@ - gate-{name}-merge +- project: + name: netconn-api + github-org: openstack + node: precise + tarball-publisher-site: nova.openstack.org + doc-publisher-site: docs.openstack.org + + jobs: + - api-jobs + + - project: name: netconn-api-v20 github-org: openstack node: precise + tarball-publisher-site: nova.openstack.org + doc-publisher-site: docs.openstack.org jobs: - - gate-{name}-merge + - api-jobs - project: @@ -220,6 +266,17 @@ - gate-{name}-merge +- project: + name: object-api + github-org: openstack + node: precise + tarball-publisher-site: nova.openstack.org + doc-publisher-site: docs.openstack.org + + jobs: + - api-jobs + + - project: name: openstack-common github-org: openstack diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index e08d17baa4..64e072c3ef 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -650,6 +650,26 @@ projects: - openstack-cli-guide - openstack-glossary + - name: openstack/compute-api + check: + - gate-compute-api-merge + gate: + - gate-compute-api-merge + + - name: openstack/identity-api + check: + - gate-identity-api-merge + gate: + - gate-identity-api-merge + + - name: openstack/image-api + check: + - gate-image-api-merge + gate: + - gate-image-api-merge + post: + - images-api-v20 + - name: openstack/netconn-api check: - gate-netconn-api-merge @@ -658,6 +678,12 @@ projects: post: - netconn-api-v20 + - name: openstack/object-api + check: + - gate-object-api-merge + gate: + - gate-object-api-merge + - name: openstack/volume-api check: - gate-volume-api-merge @@ -666,10 +692,6 @@ projects: post: - volume-api - - name: openstack/image-api - post: - - images-api-v20 - - name: openstack-dev/openstack-qa check: - gate-openstack-qa-merge