From 667321df9c72366c53fa97592d5f132cdf6d642a Mon Sep 17 00:00:00 2001
From: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk>
Date: Mon, 23 May 2022 22:21:04 +0100
Subject: [PATCH] Use integrated repo 'hosts' jobs to test different backing
stores
This uses the main openstack-ansible repo for testing these different
backing store scenarios rather than openstack-ansible-tests. This is
more maintainable and ensures that we test using the same code as is
used for a real deployment.
Depends-On: https://review.opendev.org/c/openstack/openstack-ansible/+/843027
Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-repo_server/+/843418
Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-galera_server/+/843547
Change-Id: Ic62a8fd7290318ed7c76c22620ee0b6f09075a85
---
zuul.d/jobs.yaml | 55 ---------------------------------------------
zuul.d/project.yaml | 8 +------
2 files changed, 1 insertion(+), 62 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 d18f41db..00000000
--- a/zuul.d/jobs.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
----
-# Copyright 2017, Rackspace US, Inc.
-#
-# 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-lxc-container-create
- parent: openstack-ansible-cross-repo-functional
- vars:
- osa_test_repo: "openstack/openstack-ansible-lxc_container_create"
-
-- job:
- name: openstack-ansible-lxc-dir-ubuntu-focal
- parent: openstack-ansible-lxc-container-create
- nodeset: ubuntu-focal
- vars:
- tox_env: dir
-
-- job:
- name: openstack-ansible-lxc-dir-centos-8-stream
- parent: openstack-ansible-lxc-container-create
- nodeset: centos-8-stream
- vars:
- tox_env: dir
-
-- job:
- name: openstack-ansible-lxc-btrfs-ubuntu-focal
- parent: openstack-ansible-lxc-container-create
- nodeset: ubuntu-focal
- vars:
- tox_env: btrfs
-- job:
- name: openstack-ansible-lxc-overlayfs-ubuntu-focal
- parent: openstack-ansible-lxc-container-create
- nodeset: ubuntu-focal
- vars:
- tox_env: ofs
-
-- job:
- name: openstack-ansible-lxc-zfs-ubuntu-focal
- parent: openstack-ansible-lxc-container-create
- nodeset: ubuntu-focal
- vars:
- tox_env: zfs
-
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 7720c70c..d1f8b546 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -21,10 +21,4 @@
- build-release-notes-jobs-python3
- openstack-ansible-deploy-infra_lxc-jobs
- openstack-ansible-upgrade-infra_lxc-jobs
- check:
- jobs:
- - openstack-ansible-lxc-dir-centos-8-stream
- - openstack-ansible-lxc-dir-ubuntu-focal
- - openstack-ansible-lxc-btrfs-ubuntu-focal
- - openstack-ansible-lxc-overlayfs-ubuntu-focal
- - openstack-ansible-lxc-zfs-ubuntu-focal
+ - openstack-ansible-lxc-backingstore-jobs