From 47806f55ddb5beb93745665bfb5edd20b266c55c Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Tue, 21 May 2019 12:10:32 +0200 Subject: [PATCH] Add integrated coverage Currently this role doesn't test the integrated jobs. With the dynamic execution of the roles, this role also get tested by the integrated repo. Change-Id: I340707627f72fd03de10b0af6ad8f3025a8931de --- zuul.d/jobs.yaml | 45 --------------------------------------------- zuul.d/project.yaml | 17 ++++------------- 2 files changed, 4 insertions(+), 58 deletions(-) delete mode 100644 zuul.d/jobs.yaml diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml deleted file mode 100644 index 916118f..0000000 --- a/zuul.d/jobs.yaml +++ /dev/null @@ -1,45 +0,0 @@ ---- -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -- job: - name: openstack-ansible-deploy-aio_metal_sahara-centos-7 - parent: openstack-ansible-deploy-aio - nodeset: centos-7 - vars: - action: deploy - scenario: aio_metal_sahara - -- job: - name: openstack-ansible-deploy-aio_metal_sahara-opensuse-150 - parent: openstack-ansible-deploy-aio - nodeset: opensuse-150 - vars: - action: deploy - scenario: aio_metal_sahara - -- job: - name: openstack-ansible-deploy-aio_metal_sahara-ubuntu-bionic - parent: openstack-ansible-deploy-aio - nodeset: ubuntu-bionic - vars: - action: deploy - scenario: aio_metal_sahara - -- job: - name: openstack-ansible-deploy-aio_metal_sahara-debian-stable - parent: openstack-ansible-deploy-aio - nodeset: debian-stable - vars: - action: deploy - scenario: aio_metal_sahara diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 99fddda..bebbf24 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -16,19 +16,10 @@ - project: templates: - check-requirements + - openstack-ansible-deploy-aio_metal-jobs + # Note: Uncomment the next template when distro installs are + # ready for the 3 major distros: + # - openstack-ansible-deploy-aio_distro_metal-jobs - openstack-ansible-linters - publish-openstack-docs-pti - release-notes-jobs-python3 - check: - jobs: - - openstack-ansible-deploy-aio_metal_sahara-centos-7 - - openstack-ansible-deploy-aio_metal_sahara-debian-stable - - openstack-ansible-deploy-aio_metal_sahara-ubuntu-bionic - gate: - jobs: - - openstack-ansible-deploy-aio_metal_sahara-centos-7 - - openstack-ansible-deploy-aio_metal_sahara-debian-stable - - openstack-ansible-deploy-aio_metal_sahara-ubuntu-bionic - experimental: - jobs: - - openstack-ansible-deploy-aio_metal_sahara-opensuse-150