From ea85c4221976accf6e9f86f4813f80a9ab1e465b Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sat, 2 Jul 2016 13:52:52 +0200 Subject: [PATCH] Add client-publish-job group We defined with the openstack-publish-jobs group both doc and doc-tags-only jobs, but each repos uses either of these, never both of them. Create a new openstack-client-publish-jobs group and use that as appropriate. Remove the docs-tags-only job from openstack-publish-jobs. This removes 387 unused jobs. Change-Id: I441c75debe9e9f744790a60cc51d93eef6460a9c --- jenkins/jobs/openstack-publish-jobs.yaml | 5 ++- jenkins/jobs/projects.yaml | 54 ++++++++++++------------ 2 files changed, 31 insertions(+), 28 deletions(-) diff --git a/jenkins/jobs/openstack-publish-jobs.yaml b/jenkins/jobs/openstack-publish-jobs.yaml index 59a6cd1a79..addb892b1b 100644 --- a/jenkins/jobs/openstack-publish-jobs.yaml +++ b/jenkins/jobs/openstack-publish-jobs.yaml @@ -107,8 +107,11 @@ name: openstack-publish-jobs jobs: - '{name}-docs' - - '{name}-docs-tags-only' +- job-group: + name: openstack-client-publish-jobs + jobs: + - '{name}-docs-tags-only' - job-group: name: openstack-releasenotes-jobs diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 4034b3e97a..ef3e842868 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -390,9 +390,9 @@ jobs: - python-jobs - pypi-jobs + - openstack-client-publish-jobs - 'gate-{name}-python35{suffix}': suffix: '-nv' - - openstack-publish-jobs - openstack-releasenotes-jobs - project: @@ -485,9 +485,9 @@ jobs: - python-jobs + - openstack-client-publish-jobs - 'gate-{name}-python35{suffix}': suffix: '-nv' - - openstack-publish-jobs - pypi-jobs - project: @@ -583,9 +583,9 @@ jobs: - coverage-jobs - python-jobs + - openstack-client-publish-jobs - 'gate-{name}-python35{suffix}': suffix: '-nv' - - openstack-publish-jobs - pypi-jobs - '{pipeline}-tempest-dsvm-neutron-src-{name}{job-suffix}-plugin': project-repo: ceilometer @@ -1648,9 +1648,9 @@ jobs: - python-jobs + - openstack-client-publish-jobs - 'gate-{name}-python35{suffix}': suffix: '-nv' - - openstack-publish-jobs - pypi-jobs - 'lib-forward-testing-{name}' - translation-jobs @@ -3173,9 +3173,9 @@ jobs: - coverage-jobs - python-jobs + - openstack-client-publish-jobs - 'gate-{name}-python35{suffix}': suffix: '-nv' - - openstack-publish-jobs - pypi-jobs - openstack-releasenotes-jobs - 'lib-forward-testing-{name}' @@ -5285,7 +5285,7 @@ doc-publisher-site: docs.openstack.org jobs: - - openstack-publish-jobs + - openstack-client-publish-jobs - pypi-jobs - python-jobs - 'gate-{name}-python35{suffix}': @@ -5323,7 +5323,7 @@ - 'gate-{name}-python35{suffix}': suffix: '-nv' - pypi-jobs - - openstack-publish-jobs + - openstack-client-publish-jobs - openstack-releasenotes-jobs - project: @@ -7970,7 +7970,7 @@ - 'gate-{name}-pypy' - 'gate-{name}-python35{suffix}': suffix: '-nv' - - openstack-publish-jobs + - openstack-client-publish-jobs - pypi-jobs - project: @@ -7983,7 +7983,7 @@ - 'gate-{name}-pypy' - 'gate-{name}-python35{suffix}': suffix: '-nv' - - openstack-publish-jobs + - openstack-client-publish-jobs - pypi-jobs - project: @@ -8010,7 +8010,7 @@ doc-publisher-site: docs.openstack.org jobs: - - openstack-publish-jobs + - openstack-client-publish-jobs - 'gate-{name}-pypy' - pypi-jobs - python-jobs @@ -8033,7 +8033,7 @@ - 'gate-{name}-pypy' - 'gate-{name}-python35{suffix}': suffix: '-nv' - - openstack-publish-jobs + - openstack-client-publish-jobs - pypi-jobs - '{pipeline}-tempest-dsvm-neutron-src-{name}{job-suffix}-plugin': project-repo: ceilometer @@ -8066,7 +8066,7 @@ - 'gate-{name}-pypy' - 'gate-{name}-python35{suffix}': suffix: '-nv' - - openstack-publish-jobs + - openstack-client-publish-jobs - pypi-jobs - openstack-releasenotes-jobs - 'lib-forward-testing-{name}' @@ -8129,7 +8129,7 @@ - 'gate-{name}-python35{suffix}': suffix: '-nv' - pypi-jobs - - openstack-publish-jobs + - openstack-client-publish-jobs - project: name: python-designateclient @@ -8141,7 +8141,7 @@ - python-jobs - 'gate-{name}-python35{suffix}': suffix: '-nv' - - openstack-publish-jobs + - openstack-client-publish-jobs - pypi-jobs - project: @@ -8198,7 +8198,7 @@ - python-jobs - 'gate-{name}-python35{suffix}': suffix: '-nv' - - openstack-publish-jobs + - openstack-client-publish-jobs - pypi-jobs - 'lib-forward-testing-{name}' - '{pipeline}-glanceclient-dsvm-functional{special}{job-suffix}': @@ -8225,7 +8225,7 @@ - 'gate-{name}-pypy' - 'gate-{name}-python35{suffix}': suffix: '-nv' - - openstack-publish-jobs + - openstack-client-publish-jobs - pypi-jobs - project: @@ -8286,7 +8286,7 @@ - 'gate-{name}-pypy' - 'gate-{name}-python35{suffix}': suffix: '-nv' - - openstack-publish-jobs + - openstack-client-publish-jobs - pypi-jobs - openstack-releasenotes-jobs - '{pipeline}-ironicclient-dsvm-functional{job-suffix}': @@ -8335,7 +8335,7 @@ - python-jobs - 'gate-{name}-python35{suffix}': suffix: '-nv' - - openstack-publish-jobs + - openstack-client-publish-jobs - pypi-jobs - translation-jobs - openstack-releasenotes-jobs @@ -8368,7 +8368,7 @@ - python-jobs - 'gate-{name}-python35{suffix}': suffix: '-nv' - - openstack-publish-jobs + - openstack-client-publish-jobs - pypi-jobs - translation-jobs @@ -8382,7 +8382,7 @@ - python-jobs - 'gate-{name}-python35{suffix}': suffix: '-nv' - - openstack-publish-jobs + - openstack-client-publish-jobs - pypi-jobs - openstack-releasenotes-jobs @@ -8446,7 +8446,7 @@ - 'gate-{name}-pypy' - 'gate-{name}-python35{suffix}': suffix: '-nv' - - openstack-publish-jobs + - openstack-client-publish-jobs - openstack-releasenotes-jobs - pypi-jobs - translation-jobs @@ -8474,7 +8474,7 @@ - python-jobs - 'gate-{name}-python35{suffix}': suffix: '-nv' - - openstack-publish-jobs + - openstack-client-publish-jobs - pypi-jobs - translation-jobs - openstack-releasenotes-jobs @@ -8517,7 +8517,7 @@ node: ubuntu-trusty job-suffix: '' branch-override: default - - openstack-publish-jobs + - openstack-client-publish-jobs - openstack-releasenotes-jobs - pypi-jobs - 'lib-forward-testing-{name}' @@ -8568,7 +8568,7 @@ - 'gate-{name}-python35{suffix}': suffix: '-nv' - pypi-jobs - - openstack-publish-jobs + - openstack-client-publish-jobs - openstack-releasenotes-jobs - '{pipeline}-tempest-dsvm-neutron-src-python-saharaclient{job-suffix}': pipeline: gate @@ -8595,7 +8595,7 @@ - python-jobs-searchlight - 'gate-{name}-pypy' - 'gate-{name}-python35-searchlight-nv' - - openstack-publish-jobs + - openstack-client-publish-jobs - pypi-jobs - project: @@ -8719,7 +8719,7 @@ - 'gate-{name}-pypy' - 'gate-{name}-python35{suffix}': suffix: '-nv' - - openstack-publish-jobs + - openstack-client-publish-jobs - pypi-jobs - openstack-releasenotes-jobs - '{pipeline}-tempest-dsvm-neutron-src-python-troveclient{job-suffix}': @@ -8748,7 +8748,7 @@ - python-jobs - 'gate-{name}-python35{suffix}': suffix: '-nv' - - openstack-publish-jobs + - openstack-client-publish-jobs - pypi-jobs - project: