From c04b6b52e6f63eacc8ed62a7566722de01dd1e03 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 14 Apr 2020 08:27:33 +0900 Subject: [PATCH] Use puppet-openstack-module-unit-jobs to define unit test jobs This patch replaces puppet-tripleo-module-unit-jobs by the common job definition, puppet-openstack-module-unit-jobs, so that we run unit test jobs which is consistent with the other puppet modules. By merging this changes, we expect that the following change is made to the current job definitions - Remove CentOS7 job because we don't support CentOS7 anymore - Replace puppet 6.0 job by puppet 6.11 job Backport note: The above descriptions were adjusted to reflect status of Ussuri. Conflicts: zuul.d/layout.yaml Change-Id: I21d2b8f2e267a6f330cc423572b068e3910cacc4 (cherry picked from commit ef254f7dc7ea257060042eb6ac7c8f6731d2e52b) --- zuul.d/layout.yaml | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index 374757b25..f7a758442 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -1,21 +1,7 @@ -- project-template: - name: puppet-tripleo-module-unit-jobs - check: - jobs: - - puppet-openstack-unit-5.5-centos-7 - - puppet-openstack-unit-5.5-centos-8 - - puppet-openstack-unit-6.0-ubuntu-bionic - - puppet-openstack-unit-latest-ubuntu-bionic: - voting: false - gate: - jobs: - - puppet-openstack-unit-5.5-centos-7 - - puppet-openstack-unit-5.5-centos-8 - - puppet-openstack-unit-6.0-ubuntu-bionic - - project: templates: - puppet-openstack-check-jobs + - puppet-openstack-module-unit-jobs - puppet-tripleo-module-unit-jobs - tripleo-undercloud-jobs-pipeline - tripleo-multinode-container-minimal-pipeline