From 73a779ac9051535dd670580e485d6548348fe327 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 9 Sep 2016 21:24:23 +0200 Subject: [PATCH] Cleanup: Specs repos are branchless Since specs repos are branchless and don't have stable branches, we do not need to add ubuntu-trusty jobs that only run on stable branches. Remove all of them from zuul and jenkins setup. This removes around 90 jobs. Change-Id: I478ae0ccfcb3d7811345ebafb5902bdefe4931c5 --- jenkins/jobs/specs-jobs.yaml | 1 - zuul/layout.yaml | 70 ------------------------------------ 2 files changed, 71 deletions(-) diff --git a/jenkins/jobs/specs-jobs.yaml b/jenkins/jobs/specs-jobs.yaml index c135c786b7..1d7900ab7d 100644 --- a/jenkins/jobs/specs-jobs.yaml +++ b/jenkins/jobs/specs-jobs.yaml @@ -32,7 +32,6 @@ - job-group: name: specs-jobs node: - - ubuntu-trusty - ubuntu-xenial jobs: - gate-{name}-docs-{node}: diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 9ff58f4ace..56ae46e3ff 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -812,10 +812,8 @@ project-templates: # build-only-specs-jobs instead. - name: openstack-specs-jobs check: - - 'gate-{name}-docs-ubuntu-trusty' - 'gate-{name}-docs-ubuntu-xenial' gate: - - 'gate-{name}-docs-ubuntu-trusty' - 'gate-{name}-docs-ubuntu-xenial' post: - '{name}-publish-specs' @@ -825,10 +823,8 @@ project-templates: # specs.openstack.org. - name: build-only-specs-jobs check: - - 'gate-{name}-docs-ubuntu-trusty' - 'gate-{name}-docs-ubuntu-xenial' gate: - - 'gate-{name}-docs-ubuntu-trusty' - 'gate-{name}-docs-ubuntu-xenial' - name: noop-jobs @@ -5160,10 +5156,8 @@ projects: - name: merge-check - name: openstack-specs-jobs check: - - gate-api-wg-python27-ubuntu-trusty - gate-api-wg-python27-ubuntu-xenial gate: - - gate-api-wg-python27-ubuntu-trusty - gate-api-wg-python27-ubuntu-xenial - name: openstack/app-catalog @@ -5854,13 +5848,9 @@ projects: - name: merge-check - name: openstack-specs-jobs check: - - gate-charm-specs-pep8-ubuntu-trusty - - gate-charm-specs-python27-ubuntu-trusty - gate-charm-specs-pep8-ubuntu-xenial - gate-charm-specs-python27-ubuntu-xenial gate: - - gate-charm-specs-pep8-ubuntu-trusty - - gate-charm-specs-python27-ubuntu-trusty - gate-charm-specs-pep8-ubuntu-xenial - gate-charm-specs-python27-ubuntu-xenial @@ -5939,10 +5929,8 @@ projects: - name: merge-check - name: openstack-specs-jobs check: - - gate-cinder-specs-python27-ubuntu-trusty - gate-cinder-specs-python27-ubuntu-xenial gate: - - gate-cinder-specs-python27-ubuntu-trusty - gate-cinder-specs-python27-ubuntu-xenial - name: openstack/cisco-ironic-contrib @@ -6135,10 +6123,8 @@ projects: - name: merge-check - name: openstack-specs-jobs check: - - gate-congress-specs-python27-ubuntu-trusty - gate-congress-specs-python27-ubuntu-xenial gate: - - gate-congress-specs-python27-ubuntu-trusty - gate-congress-specs-python27-ubuntu-xenial - name: openstack/conveyor @@ -7955,10 +7941,8 @@ projects: - name: merge-check - name: openstack-specs-jobs check: - - gate-designate-specs-python27-ubuntu-trusty - gate-designate-specs-python27-ubuntu-xenial gate: - - gate-designate-specs-python27-ubuntu-trusty - gate-designate-specs-python27-ubuntu-xenial - name: openstack/designate-tempest-plugin @@ -8215,10 +8199,8 @@ projects: - name: merge-check - name: openstack-specs-jobs check: - - gate-docs-specs-python27-ubuntu-trusty - gate-docs-specs-python27-ubuntu-xenial gate: - - gate-docs-specs-python27-ubuntu-trusty - gate-docs-specs-python27-ubuntu-xenial - name: openstack/dox @@ -8428,10 +8410,8 @@ projects: - name: merge-check - name: openstack-specs-jobs check: - - gate-freezer-specs-python27-ubuntu-trusty - gate-freezer-specs-python27-ubuntu-xenial gate: - - gate-freezer-specs-python27-ubuntu-trusty - gate-freezer-specs-python27-ubuntu-xenial - name: openstack/freezer-web-ui @@ -9198,10 +9178,8 @@ projects: - name: merge-check - name: openstack-specs-jobs check: - - gate-fuel-specs-python27-ubuntu-trusty - gate-fuel-specs-python27-ubuntu-xenial gate: - - gate-fuel-specs-python27-ubuntu-trusty - gate-fuel-specs-python27-ubuntu-xenial - name: openstack/fuel-stats @@ -9358,10 +9336,8 @@ projects: - name: merge-check - name: openstack-specs-jobs check: - - gate-glance-specs-python27-ubuntu-trusty - gate-glance-specs-python27-ubuntu-xenial gate: - - gate-glance-specs-python27-ubuntu-trusty - gate-glance-specs-python27-ubuntu-xenial - name: openstack/glance_store @@ -9507,10 +9483,8 @@ projects: - name: merge-check - name: build-only-specs-jobs check: - - gate-group-based-policy-specs-python27-ubuntu-trusty - gate-group-based-policy-specs-python27-ubuntu-xenial gate: - - gate-group-based-policy-specs-python27-ubuntu-trusty - gate-group-based-policy-specs-python27-ubuntu-xenial - name: openstack/group-based-policy-ui @@ -9593,10 +9567,8 @@ projects: - name: merge-check - name: openstack-specs-jobs check: - - gate-heat-specs-python27-ubuntu-trusty - gate-heat-specs-python27-ubuntu-xenial gate: - - gate-heat-specs-python27-ubuntu-trusty - gate-heat-specs-python27-ubuntu-xenial - name: openstack/heat-templates @@ -9833,10 +9805,8 @@ projects: - name: merge-check - name: openstack-specs-jobs check: - - gate-ironic-inspector-specs-pep8-ubuntu-trusty - gate-ironic-inspector-specs-pep8-ubuntu-xenial gate: - - gate-ironic-inspector-specs-pep8-ubuntu-trusty - gate-ironic-inspector-specs-pep8-ubuntu-xenial - name: openstack/ironic-lib @@ -9899,10 +9869,8 @@ projects: - name: merge-check - name: openstack-specs-jobs check: - - gate-ironic-specs-python27-ubuntu-trusty - gate-ironic-specs-python27-ubuntu-xenial gate: - - gate-ironic-specs-python27-ubuntu-trusty - gate-ironic-specs-python27-ubuntu-xenial - name: openstack/ironic-staging-drivers @@ -10040,10 +10008,8 @@ projects: - name: merge-check - name: openstack-specs-jobs check: - - gate-keystone-specs-python27-ubuntu-trusty - gate-keystone-specs-python27-ubuntu-xenial gate: - - gate-keystone-specs-python27-ubuntu-trusty - gate-keystone-specs-python27-ubuntu-xenial - name: openstack/keystoneauth @@ -10169,10 +10135,8 @@ projects: - name: merge-check - name: build-only-specs-jobs check: - - gate-kosmos-specs-python27-ubuntu-trusty - gate-kosmos-specs-python27-ubuntu-xenial gate: - - gate-kosmos-specs-python27-ubuntu-trusty - gate-kosmos-specs-python27-ubuntu-xenial - name: openstack/kuryr @@ -10354,10 +10318,8 @@ projects: - name: merge-check - name: openstack-specs-jobs check: - - gate-manila-specs-python27-ubuntu-trusty - gate-manila-specs-python27-ubuntu-xenial gate: - - gate-manila-specs-python27-ubuntu-trusty - gate-manila-specs-python27-ubuntu-xenial - name: openstack/manila-ui @@ -10457,10 +10419,8 @@ projects: - name: merge-check - name: openstack-specs-jobs check: - - gate-mistral-specs-python27-ubuntu-trusty - gate-mistral-specs-python27-ubuntu-xenial gate: - - gate-mistral-specs-python27-ubuntu-trusty - gate-mistral-specs-python27-ubuntu-xenial - name: openstack/monasca-agent @@ -11396,10 +11356,8 @@ projects: - name: merge-check - name: openstack-specs-jobs check: - - gate-neutron-specs-python27-ubuntu-trusty - gate-neutron-specs-python27-ubuntu-xenial gate: - - gate-neutron-specs-python27-ubuntu-trusty - gate-neutron-specs-python27-ubuntu-xenial - name: openstack/neutron-vpnaas @@ -11543,13 +11501,9 @@ projects: - name: merge-check - name: openstack-specs-jobs check: - - gate-nova-specs-pep8-ubuntu-trusty - - gate-nova-specs-python27-ubuntu-trusty - gate-nova-specs-pep8-ubuntu-xenial - gate-nova-specs-python27-ubuntu-xenial gate: - - gate-nova-specs-pep8-ubuntu-trusty - - gate-nova-specs-python27-ubuntu-trusty - gate-nova-specs-pep8-ubuntu-xenial - gate-nova-specs-python27-ubuntu-xenial @@ -13006,10 +12960,8 @@ projects: - name: merge-check - name: build-only-specs-jobs check: - - gate-packetary-specs-python27-ubuntu-trusty - gate-packetary-specs-python27-ubuntu-xenial gate: - - gate-packetary-specs-python27-ubuntu-trusty - gate-packetary-specs-python27-ubuntu-xenial - name: openstack/packstack @@ -13513,10 +13465,8 @@ projects: - name: merge-check - name: openstack-specs-jobs check: - - gate-puppet-openstack-specs-python27-ubuntu-trusty - gate-puppet-openstack-specs-python27-ubuntu-xenial gate: - - gate-puppet-openstack-specs-python27-ubuntu-trusty - gate-puppet-openstack-specs-python27-ubuntu-xenial - name: openstack/puppet-openstacklib @@ -15132,10 +15082,8 @@ projects: - name: merge-check - name: openstack-specs-jobs check: - - gate-sahara-specs-python27-ubuntu-trusty - gate-sahara-specs-python27-ubuntu-xenial gate: - - gate-sahara-specs-python27-ubuntu-trusty - gate-sahara-specs-python27-ubuntu-xenial - name: openstack/sahara-tests @@ -15254,10 +15202,8 @@ projects: - name: merge-check - name: openstack-specs-jobs check: - - gate-searchlight-specs-python27-ubuntu-trusty - gate-searchlight-specs-python27-ubuntu-xenial gate: - - gate-searchlight-specs-python27-ubuntu-trusty - gate-searchlight-specs-python27-ubuntu-xenial - name: openstack/searchlight-ui @@ -15300,10 +15246,8 @@ projects: - name: merge-check - name: openstack-specs-jobs check: - - gate-security-specs-python27-ubuntu-trusty - gate-security-specs-python27-ubuntu-xenial gate: - - gate-security-specs-python27-ubuntu-trusty - gate-security-specs-python27-ubuntu-xenial - name: openstack/senlin @@ -15929,10 +15873,8 @@ projects: - name: merge-check - name: openstack-specs-jobs check: - - gate-tacker-specs-python27-ubuntu-trusty - gate-tacker-specs-python27-ubuntu-xenial gate: - - gate-tacker-specs-python27-ubuntu-trusty - gate-tacker-specs-python27-ubuntu-xenial - name: openstack/tap-as-a-service @@ -15967,10 +15909,8 @@ projects: - name: merge-check - name: build-only-specs-jobs check: - - gate-telcowg-usecases-python27-ubuntu-trusty - gate-telcowg-usecases-python27-ubuntu-xenial gate: - - gate-telcowg-usecases-python27-ubuntu-trusty - gate-telcowg-usecases-python27-ubuntu-xenial - name: openstack/telemetry-specs @@ -15978,10 +15918,8 @@ projects: - name: merge-check - name: openstack-specs-jobs check: - - gate-telemetry-specs-python27-ubuntu-trusty - gate-telemetry-specs-python27-ubuntu-xenial gate: - - gate-telemetry-specs-python27-ubuntu-trusty - gate-telemetry-specs-python27-ubuntu-xenial - name: openstack/tempest @@ -16352,10 +16290,8 @@ projects: - name: merge-check - name: openstack-specs-jobs check: - - gate-tripleo-specs-python27-ubuntu-trusty - gate-tripleo-specs-python27-ubuntu-xenial gate: - - gate-tripleo-specs-python27-ubuntu-trusty - gate-tripleo-specs-python27-ubuntu-xenial - name: openstack/tripleo-ui @@ -16473,10 +16409,8 @@ projects: - name: merge-check - name: openstack-specs-jobs check: - - gate-trove-specs-python27-ubuntu-trusty - gate-trove-specs-python27-ubuntu-xenial gate: - - gate-trove-specs-python27-ubuntu-trusty - gate-trove-specs-python27-ubuntu-xenial - name: openstack/tuning-box @@ -16596,10 +16530,8 @@ projects: - name: merge-check - name: openstack-specs-jobs check: - - gate-watcher-specs-python27-ubuntu-trusty - gate-watcher-specs-python27-ubuntu-xenial gate: - - gate-watcher-specs-python27-ubuntu-trusty - gate-watcher-specs-python27-ubuntu-xenial - name: openstack/windmill @@ -16838,10 +16770,8 @@ projects: - name: merge-check - name: openstack-specs-jobs check: - - gate-zaqar-specs-python27-ubuntu-trusty - gate-zaqar-specs-python27-ubuntu-xenial gate: - - gate-zaqar-specs-python27-ubuntu-trusty - gate-zaqar-specs-python27-ubuntu-xenial - name: openstack/zaqar-ui