From d04285381a14a02c1f4ebc6a402f6c4b85ee3b9d Mon Sep 17 00:00:00 2001
From: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk>
Date: Tue, 7 Dec 2021 09:21:11 +0000
Subject: [PATCH] Remove uw_apache functional jobs.

These jobs simply switched the webserver from nginx to apache using
a tox environment with keystone_web_server=apache. The integrated
tests now only support apache as the keystone web server so these
jobs are now redundant and are not providing any additional value.

Change-Id: I125bfc478a644ae03fc32be2609198f425132356
---
 tox.ini             |  7 -------
 zuul.d/jobs.yaml    | 35 -----------------------------------
 zuul.d/project.yaml | 10 ----------
 3 files changed, 52 deletions(-)
 delete mode 100644 zuul.d/jobs.yaml

diff --git a/tox.ini b/tox.ini
index 3730e3d7..ff0de28a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -94,13 +94,6 @@ setenv =
 commands =
     bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
 
-[testenv:uw_apache]
-setenv =
-    {[testenv]setenv}
-    ANSIBLE_PARAMETERS=-vvv -e keystone_web_server=apache
-commands =
-    bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
-
 [testenv:linters]
 commands =
     bash -c "{toxinidir}/tests/common/test-ansible-env-prep.sh"
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
deleted file mode 100644
index 50886cfa..00000000
--- a/zuul.d/jobs.yaml
+++ /dev/null
@@ -1,35 +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-uw_apache
-    parent: openstack-ansible-functional
-    vars:
-      tox_env: uw_apache
-
-- job:
-    name: openstack-ansible-uw_apache-ubuntu-bionic
-    parent: openstack-ansible-uw_apache
-    nodeset: ubuntu-bionic
-
-- job:
-    name: openstack-ansible-uw_apache-ubuntu-focal
-    parent: openstack-ansible-uw_apache
-    nodeset: ubuntu-focal
-
-- job:
-    name: openstack-ansible-uw_apache-centos-8
-    parent: openstack-ansible-uw_apache
-    nodeset: centos-8
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index fb23136d..d9a9cf24 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -21,13 +21,3 @@
       - openstack-ansible-deploy-aio_distro_metal-jobs
       - publish-openstack-docs-pti
       - build-release-notes-jobs-python3
-    check:
-      jobs:
-        - openstack-ansible-uw_apache-centos-8
-        - openstack-ansible-uw_apache-ubuntu-bionic
-        - openstack-ansible-uw_apache-ubuntu-focal
-    gate:
-      jobs:
-        - openstack-ansible-uw_apache-centos-8
-        - openstack-ansible-uw_apache-ubuntu-bionic
-        - openstack-ansible-uw_apache-ubuntu-focal