From 1d71479a4cea2a90eb2f244864fbcc665ed9484f Mon Sep 17 00:00:00 2001
From: Stephen Finucane <sfinucan@redhat.com>
Date: Mon, 7 Nov 2022 16:35:56 +0000
Subject: [PATCH] zuul: Remove nova-network tests

nova-network has been removed from nova for a very long time now and
we've no way to test it in CI save for installing old versions of
OpenStack. We don't care about this enough to do that, so just remove
the thing.

In the vein of things that have been removed, we also remove
configuration that was supposed to enable cinder's v1 API but doesn't
since the related knob was removed over 5 years ago [1].

[1] https://github.com/openstack/cinder/commit/3e91de956e1947a7014709010b99df380242ac74

Change-Id: I76efeccec04937c3a68108e2654872e00fadcec4
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
---
 .zuul.yaml | 34 ----------------------------------
 1 file changed, 34 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 7883a4b19c..95ab34aba2 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -54,12 +54,6 @@
         LIBS_FROM_GIT: python-openstackclient
         # NOTE(dtroyer): Functional tests need a bit more volume headroom
         VOLUME_BACKING_FILE_SIZE: 20G
-      devstack_local_conf:
-        post-config:
-          $CINDER_CONF:
-            DEFAULT:
-              # NOTE(dtroyer): OSC needs to support Volume v1 for a while yet so re-enable
-              enable_v1_api: true
       devstack_services:
         ceilometer-acentral: false
         ceilometer-acompute: false
@@ -114,28 +108,6 @@
         Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
       tox_envlist: functional
 
-- job:
-    name: osc-functional-devstack-n-net
-    parent: osc-functional-devstack-base
-    timeout: 7800
-    vars:
-      devstack_localrc:
-        FLAT_INTERFACE: br_flat
-        PUBLIC_INTERFACE: br_pub
-      devstack_services:
-        n-cell: true
-        n-net: true
-        neutron: false
-        neutron-segments: false
-        q-agt: false
-        q-dhcp: false
-        q-l3: false
-        q-meta: false
-        q-metering: false
-        q-qos: false
-        q-svc: false
-      tox_envlist: functional
-
 - job:
     name: osc-functional-devstack-tips
     parent: osc-functional-devstack
@@ -232,12 +204,6 @@
       jobs:
         - osc-build-image
         - osc-functional-devstack
-        # - osc-functional-devstack-n-net:
-        #     voting: false
-        #     # The job testing nova-network no longer works before Pike, and
-        #     # should be disabled until the New Way of testing against old clouds
-        #     # is ready and backported
-        #     branches: ^(?!stable/(newton|ocata)).*$
         - osc-functional-devstack-tips:
             # The functional-tips job only tests the latest and shouldn't be run
             # on the stable branches