From 6960886d46cd24ca0f5fb0ada2c4e5eceb1f2116 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Wed, 5 Dec 2018 16:15:49 -0700 Subject: [PATCH] Limit integration jobs to Puppet5 Because we have so many jobs, it's hard to actually land code. Let's reduce the gating jobs to just Puppet5 as Puppet 4 is nearing EOL. This change also moves puppet 6 to experimental if we wish to test it but does not force puppet 6 on all the jobs. It would be beneficial to switch the puppet 5 jobs out with puppet 6 jobs next cycle as projects are migrated to the next version. TripleO is moving to puppet 5 during the Stein cycle and tenatively looking to puppet 6 in the Train cycle. Change-Id: I8ae350a149640badc43abc458c65eb0f93e5fb53 --- zuul.d/layout.yaml | 60 +++++++++++++--------------------------------- 1 file changed, 16 insertions(+), 44 deletions(-) diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index c7ca4c33e..43a43e7ad 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -55,10 +55,6 @@ name: puppet-openstack-integration-jobs-all check: jobs: - - puppet-openstack-integration-4-scenario001-tempest-centos-7-luminous - - puppet-openstack-integration-4-scenario002-tempest-centos-7 - - puppet-openstack-integration-4-scenario003-tempest-centos-7 - - puppet-openstack-integration-4-scenario004-tempest-centos-7-mimic - puppet-openstack-integration-5-scenario001-tempest-centos-7-luminous - puppet-openstack-integration-5-scenario002-tempest-centos-7 - puppet-openstack-integration-5-scenario003-tempest-centos-7 @@ -67,14 +63,6 @@ - puppet-openstack-integration-5-scenario002-tempest-ubuntu-bionic - puppet-openstack-integration-5-scenario003-tempest-ubuntu-bionic - puppet-openstack-integration-5-scenario004-tempest-ubuntu-bionic-mimic - - puppet-openstack-integration-6-scenario001-tempest-centos-7-luminous - - puppet-openstack-integration-6-scenario002-tempest-centos-7 - - puppet-openstack-integration-6-scenario003-tempest-centos-7 - - puppet-openstack-integration-6-scenario004-tempest-centos-7-mimic - - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic - - puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic - - puppet-openstack-integration-6-scenario003-tempest-ubuntu-bionic - - puppet-openstack-integration-6-scenario004-tempest-ubuntu-bionic-mimic - puppet-openstack-integration-4-scenario001-tempest-debian-stable-luminous: voting: false - puppet-openstack-integration-4-scenario002-tempest-debian-stable: @@ -85,22 +73,12 @@ voting: false gate: jobs: - - puppet-openstack-integration-4-scenario001-tempest-centos-7-luminous - - puppet-openstack-integration-4-scenario002-tempest-centos-7 - - puppet-openstack-integration-4-scenario003-tempest-centos-7 - - puppet-openstack-integration-4-scenario004-tempest-centos-7-mimic - puppet-openstack-integration-5-scenario001-tempest-centos-7-luminous - puppet-openstack-integration-5-scenario002-tempest-centos-7 - puppet-openstack-integration-5-scenario003-tempest-centos-7 - puppet-openstack-integration-5-scenario004-tempest-centos-7-mimic - puppet-openstack-integration-5-scenario001-tempest-ubuntu-bionic-mimic - puppet-openstack-integration-5-scenario002-tempest-ubuntu-bionic - - puppet-openstack-integration-6-scenario001-tempest-centos-7-luminous - - puppet-openstack-integration-6-scenario002-tempest-centos-7 - - puppet-openstack-integration-6-scenario003-tempest-centos-7 - - puppet-openstack-integration-6-scenario004-tempest-centos-7-mimic - - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic - - puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic experimental: jobs: - puppet-openstack-integration-5-scenario001-tempest-debian-stable-luminous @@ -111,91 +89,85 @@ - puppet-openstack-integration-6-scenario002-tempest-debian-stable - puppet-openstack-integration-6-scenario003-tempest-debian-stable - puppet-openstack-integration-6-scenario004-tempest-debian-stable-luminous + - puppet-openstack-integration-6-scenario001-tempest-centos-7-luminous + - puppet-openstack-integration-6-scenario002-tempest-centos-7 + - puppet-openstack-integration-6-scenario003-tempest-centos-7 + - puppet-openstack-integration-6-scenario004-tempest-centos-7-mimic + - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic + - puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic + - puppet-openstack-integration-6-scenario003-tempest-ubuntu-bionic + - puppet-openstack-integration-6-scenario004-tempest-ubuntu-bionic-mimic - project-template: name: puppet-openstack-integration-jobs-scenario001 check: jobs: - puppet-openstack-integration-5-scenario001-tempest-ubuntu-bionic-mimic - - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic - - puppet-openstack-integration-4-scenario001-tempest-centos-7-luminous - puppet-openstack-integration-5-scenario001-tempest-centos-7-luminous - - puppet-openstack-integration-6-scenario001-tempest-centos-7-luminous - puppet-openstack-integration-4-scenario001-tempest-debian-stable-luminous: voting: false gate: jobs: - puppet-openstack-integration-5-scenario001-tempest-ubuntu-bionic-mimic - - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic - - puppet-openstack-integration-4-scenario001-tempest-centos-7-luminous - puppet-openstack-integration-5-scenario001-tempest-centos-7-luminous - - puppet-openstack-integration-6-scenario001-tempest-centos-7-luminous experimental: jobs: - puppet-openstack-integration-5-scenario001-tempest-debian-stable-luminous - puppet-openstack-integration-6-scenario001-tempest-debian-stable-luminous + - puppet-openstack-integration-6-scenario001-tempest-ubuntu-bionic-mimic + - puppet-openstack-integration-6-scenario001-tempest-centos-7-luminous - project-template: name: puppet-openstack-integration-jobs-scenario002 check: jobs: - puppet-openstack-integration-5-scenario002-tempest-ubuntu-bionic - - puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic - - puppet-openstack-integration-4-scenario002-tempest-centos-7 - puppet-openstack-integration-5-scenario002-tempest-centos-7 - - puppet-openstack-integration-6-scenario002-tempest-centos-7 - puppet-openstack-integration-4-scenario002-tempest-debian-stable: voting: false gate: jobs: - puppet-openstack-integration-5-scenario002-tempest-ubuntu-bionic - - puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic - - puppet-openstack-integration-4-scenario002-tempest-centos-7 - puppet-openstack-integration-5-scenario002-tempest-centos-7 - - puppet-openstack-integration-6-scenario002-tempest-centos-7 experimental: jobs: - puppet-openstack-integration-5-scenario002-tempest-debian-stable - puppet-openstack-integration-6-scenario002-tempest-debian-stable + - puppet-openstack-integration-6-scenario002-tempest-ubuntu-bionic + - puppet-openstack-integration-6-scenario002-tempest-centos-7 - project-template: name: puppet-openstack-integration-jobs-scenario003 check: jobs: - puppet-openstack-integration-5-scenario003-tempest-ubuntu-bionic - - puppet-openstack-integration-6-scenario003-tempest-ubuntu-bionic - - puppet-openstack-integration-4-scenario003-tempest-centos-7 - puppet-openstack-integration-5-scenario003-tempest-centos-7 - - puppet-openstack-integration-6-scenario003-tempest-centos-7 - puppet-openstack-integration-4-scenario003-tempest-debian-stable: voting: false gate: jobs: - - puppet-openstack-integration-4-scenario003-tempest-centos-7 - puppet-openstack-integration-5-scenario003-tempest-centos-7 - - puppet-openstack-integration-6-scenario003-tempest-centos-7 experimental: jobs: - puppet-openstack-integration-5-scenario003-tempest-debian-stable - puppet-openstack-integration-6-scenario003-tempest-debian-stable + - puppet-openstack-integration-6-scenario003-tempest-ubuntu-bionic + - puppet-openstack-integration-6-scenario003-tempest-centos-7 - project-template: name: puppet-openstack-integration-jobs-scenario004 check: jobs: - puppet-openstack-integration-5-scenario004-tempest-ubuntu-bionic-mimic - - puppet-openstack-integration-6-scenario004-tempest-ubuntu-bionic-mimic - - puppet-openstack-integration-4-scenario004-tempest-centos-7-mimic - puppet-openstack-integration-5-scenario004-tempest-centos-7-mimic - - puppet-openstack-integration-6-scenario004-tempest-centos-7-mimic - puppet-openstack-integration-4-scenario004-tempest-debian-stable-luminous: voting: false gate: jobs: - - puppet-openstack-integration-4-scenario004-tempest-centos-7-mimic - puppet-openstack-integration-5-scenario004-tempest-centos-7-mimic - - puppet-openstack-integration-6-scenario004-tempest-centos-7-mimic experimental: jobs: - puppet-openstack-integration-5-scenario004-tempest-debian-stable-luminous - puppet-openstack-integration-6-scenario004-tempest-debian-stable-luminous + - puppet-openstack-integration-6-scenario004-tempest-ubuntu-bionic-mimic + - puppet-openstack-integration-6-scenario004-tempest-centos-7-mimic