From a37eb7d8d4fe2a30415a684a7dff9c70073fd379 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Mon, 26 Mar 2018 10:48:58 +0800 Subject: [PATCH] Add puppet5 jobs into check and gate pipeline All the conditions are ready. We can start the puppet5 working. With [1] we are testing against the latest puppet5 versions. [1] https://review.openstack.org/#/c/565871/ Depends-On: https://review.openstack.org/#/c/565871/ Change-Id: Ic770ec46aeaaea0f6e5fec40ea339c30f1bf3796 --- .zuul.yaml | 48 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 2317db164..e1e9291f2 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -263,10 +263,18 @@ - puppet-openstack-integration-4-scenario002-tempest-centos-7 - puppet-openstack-integration-4-scenario003-tempest-centos-7 - puppet-openstack-integration-4-scenario004-tempest-centos-7 + - puppet-openstack-integration-5-scenario001-tempest-centos-7 + - puppet-openstack-integration-5-scenario002-tempest-centos-7 + - puppet-openstack-integration-5-scenario003-tempest-centos-7 + - puppet-openstack-integration-5-scenario004-tempest-centos-7 - puppet-openstack-integration-4-scenario001-tempest-ubuntu-xenial - puppet-openstack-integration-4-scenario002-tempest-ubuntu-xenial - puppet-openstack-integration-4-scenario003-tempest-ubuntu-xenial - puppet-openstack-integration-4-scenario004-tempest-ubuntu-xenial + - puppet-openstack-integration-5-scenario001-tempest-ubuntu-xenial + - puppet-openstack-integration-5-scenario002-tempest-ubuntu-xenial + - puppet-openstack-integration-5-scenario003-tempest-ubuntu-xenial + - puppet-openstack-integration-5-scenario004-tempest-ubuntu-xenial - puppet-openstack-integration-4-scenario001-tempest-debian-stable: voting: false - puppet-openstack-integration-4-scenario002-tempest-debian-stable: @@ -281,20 +289,20 @@ - puppet-openstack-integration-4-scenario002-tempest-centos-7 - puppet-openstack-integration-4-scenario003-tempest-centos-7 - puppet-openstack-integration-4-scenario004-tempest-centos-7 - - puppet-openstack-integration-4-scenario001-tempest-ubuntu-xenial - - puppet-openstack-integration-4-scenario002-tempest-ubuntu-xenial - - puppet-openstack-integration-4-scenario003-tempest-ubuntu-xenial - - puppet-openstack-integration-4-scenario004-tempest-ubuntu-xenial - experimental: - jobs: - puppet-openstack-integration-5-scenario001-tempest-centos-7 - puppet-openstack-integration-5-scenario002-tempest-centos-7 - puppet-openstack-integration-5-scenario003-tempest-centos-7 - puppet-openstack-integration-5-scenario004-tempest-centos-7 + - puppet-openstack-integration-4-scenario001-tempest-ubuntu-xenial + - puppet-openstack-integration-4-scenario002-tempest-ubuntu-xenial + - puppet-openstack-integration-4-scenario003-tempest-ubuntu-xenial + - puppet-openstack-integration-4-scenario004-tempest-ubuntu-xenial - puppet-openstack-integration-5-scenario001-tempest-ubuntu-xenial - puppet-openstack-integration-5-scenario002-tempest-ubuntu-xenial - puppet-openstack-integration-5-scenario003-tempest-ubuntu-xenial - puppet-openstack-integration-5-scenario004-tempest-ubuntu-xenial + experimental: + jobs: - puppet-openstack-integration-5-scenario001-tempest-debian-stable - puppet-openstack-integration-5-scenario002-tempest-debian-stable - puppet-openstack-integration-5-scenario003-tempest-debian-stable @@ -305,17 +313,19 @@ check: jobs: - puppet-openstack-integration-4-scenario001-tempest-ubuntu-xenial + - puppet-openstack-integration-5-scenario001-tempest-ubuntu-xenial - puppet-openstack-integration-4-scenario001-tempest-centos-7 + - puppet-openstack-integration-5-scenario001-tempest-centos-7 - puppet-openstack-integration-4-scenario001-tempest-debian-stable: voting: false gate: jobs: - puppet-openstack-integration-4-scenario001-tempest-ubuntu-xenial + - puppet-openstack-integration-5-scenario001-tempest-ubuntu-xenial - puppet-openstack-integration-4-scenario001-tempest-centos-7 + - puppet-openstack-integration-5-scenario001-tempest-centos-7 experimental: jobs: - - puppet-openstack-integration-5-scenario001-tempest-ubuntu-xenial - - puppet-openstack-integration-5-scenario001-tempest-centos-7 - puppet-openstack-integration-5-scenario001-tempest-debian-stable - project-template: @@ -323,17 +333,19 @@ check: jobs: - puppet-openstack-integration-4-scenario002-tempest-ubuntu-xenial + - puppet-openstack-integration-5-scenario002-tempest-ubuntu-xenial - puppet-openstack-integration-4-scenario002-tempest-centos-7 + - puppet-openstack-integration-5-scenario002-tempest-centos-7 - puppet-openstack-integration-4-scenario002-tempest-debian-stable: voting: false gate: jobs: - puppet-openstack-integration-4-scenario002-tempest-ubuntu-xenial + - puppet-openstack-integration-5-scenario002-tempest-ubuntu-xenial - puppet-openstack-integration-4-scenario002-tempest-centos-7 + - puppet-openstack-integration-5-scenario002-tempest-centos-7 experimental: jobs: - - puppet-openstack-integration-5-scenario002-tempest-ubuntu-xenial - - puppet-openstack-integration-5-scenario002-tempest-centos-7 - puppet-openstack-integration-5-scenario002-tempest-debian-stable - project-template: @@ -341,36 +353,40 @@ check: jobs: - puppet-openstack-integration-4-scenario003-tempest-ubuntu-xenial + - puppet-openstack-integration-5-scenario003-tempest-ubuntu-xenial - puppet-openstack-integration-4-scenario003-tempest-centos-7 + - puppet-openstack-integration-5-scenario003-tempest-centos-7 - puppet-openstack-integration-4-scenario003-tempest-debian-stable: voting: false gate: jobs: - puppet-openstack-integration-4-scenario003-tempest-ubuntu-xenial + - puppet-openstack-integration-5-scenario003-tempest-ubuntu-xenial - puppet-openstack-integration-4-scenario003-tempest-centos-7 + - puppet-openstack-integration-5-scenario003-tempest-centos-7 experimental: jobs: - - puppet-openstack-integration-5-scenario003-tempest-ubuntu-xenial - - puppet-openstack-integration-5-scenario003-tempest-centos-7 - - puppet-openstack-integration-4-scenario003-tempest-debian-stable + - puppet-openstack-integration-5-scenario003-tempest-debian-stable - project-template: name: puppet-openstack-integration-jobs-scenario004 check: jobs: - puppet-openstack-integration-4-scenario004-tempest-ubuntu-xenial + - puppet-openstack-integration-5-scenario004-tempest-ubuntu-xenial - puppet-openstack-integration-4-scenario004-tempest-centos-7 + - puppet-openstack-integration-5-scenario004-tempest-centos-7 - puppet-openstack-integration-4-scenario004-tempest-debian-stable: voting: false gate: jobs: - puppet-openstack-integration-4-scenario004-tempest-ubuntu-xenial + - puppet-openstack-integration-5-scenario004-tempest-ubuntu-xenial - puppet-openstack-integration-4-scenario004-tempest-centos-7 + - puppet-openstack-integration-5-scenario004-tempest-centos-7 experimental: jobs: - - puppet-openstack-integration-5-scenario004-tempest-ubuntu-xenial - - puppet-openstack-integration-5-scenario004-tempest-centos-7 - - puppet-openstack-integration-4-scenario004-tempest-debian-stable + - puppet-openstack-integration-5-scenario004-tempest-debian-stable - job: name: puppet-openstack-module-base