From dc66d64a9af40c7afc02f8428d294d1bd6a08dba Mon Sep 17 00:00:00 2001
From: Matt Riedemann <mriedem.os@gmail.com>
Date: Fri, 29 Sep 2017 09:58:22 -0400
Subject: [PATCH] Remove nova-net jobs that are >newton

nova-network only starts in a cells v1 config starting
in ocata, so these jobs wouldn't work.

Also note that the jobs in the tempest and devstack-gate
sections aren't running on ocata/pike anyway because of this
filter:

  - name: ^gate-tempest-dsvm(-multinode)?-nnet-ubuntu-xenial
    branch: stable/newton

Change-Id: I12fcc305cdc834f65ef87b2f9176b17018f0d84c
---
 zuul.d/projects.yaml | 35 -----------------------------------
 zuul/layout.yaml     |  4 ----
 2 files changed, 39 deletions(-)

diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 9059d548b5..e67b83574c 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -663,9 +663,6 @@
         - legacy-tempest-dsvm-nnet-newton:
             voting: false
             branches: stable/newton
-        - legacy-tempest-dsvm-nnet-ocata:
-            voting: false
-            branches: stable/newton
         - legacy-tempest-dsvm-neutron-full-newton:
             voting: false
             branches: ^(?!driverfixes/).*$
@@ -43450,18 +43447,6 @@
               - ^tempest/hacking/.*$
               - ^tempest/tests/.*$
             voting: false
-        - legacy-tempest-dsvm-nnet-ocata:
-            branches: stable/newton
-            irrelevant-files:
-              - ^(test-|)requirements.txt$
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^etc/.*$
-              - ^releasenotes/.*$
-              - ^setup.cfg$
-              - ^tempest/hacking/.*$
-              - ^tempest/tests/.*$
-            voting: false
         - legacy-tempest-dsvm-neutron-full-ocata:
             branches: ^(?!driverfixes/).*$
             irrelevant-files:
@@ -43786,16 +43771,6 @@
               - ^setup.cfg$
               - ^tempest/hacking/.*$
               - ^tempest/tests/.*$
-        - legacy-periodic-tempest-dsvm-nnet-ocata:
-            irrelevant-files:
-              - ^(test-|)requirements.txt$
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^etc/.*$
-              - ^releasenotes/.*$
-              - ^setup.cfg$
-              - ^tempest/hacking/.*$
-              - ^tempest/tests/.*$
         - legacy-periodic-tempest-dsvm-neutron-full-ocata:
             irrelevant-files:
               - ^(test-|)requirements.txt$
@@ -43806,16 +43781,6 @@
               - ^setup.cfg$
               - ^tempest/hacking/.*$
               - ^tempest/tests/.*$
-        - legacy-periodic-tempest-dsvm-nnet-pike:
-            irrelevant-files:
-              - ^(test-|)requirements.txt$
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^etc/.*$
-              - ^releasenotes/.*$
-              - ^setup.cfg$
-              - ^tempest/hacking/.*$
-              - ^tempest/tests/.*$
         - legacy-periodic-tempest-dsvm-neutron-full-pike:
             irrelevant-files:
               - ^(test-|)requirements.txt$
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index f4d155f640..b88eb52dbb 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3827,7 +3827,6 @@ projects:
       - gate-neutron-dsvm-api-ubuntu-xenial-nv
       - gate-swift-dsvm-functional-ubuntu-xenial-nv
       - gate-tempest-dsvm-nnet-ubuntu-xenial-newton-nv
-      - gate-tempest-dsvm-nnet-ubuntu-xenial-ocata-nv
       - gate-tempest-dsvm-neutron-full-ubuntu-xenial-newton-nv
       - gate-tempest-dsvm-neutron-full-ubuntu-xenial-ocata-nv
       - gate-tempest-dsvm-neutron-full-ubuntu-xenial-pike-nv
@@ -17816,7 +17815,6 @@ projects:
       # NOTE(andreaf) We did not run nnet in Tempest gate during pike development
       - gate-tempest-dsvm-neutron-full-ubuntu-xenial-pike
       # ocata compat jobs for tempest master
-      - gate-tempest-dsvm-nnet-ubuntu-xenial-ocata
       - gate-tempest-dsvm-neutron-full-ubuntu-xenial-ocata
       # newton compat jobs for tempest master
       - gate-tempest-dsvm-nnet-ubuntu-xenial-newton
@@ -17858,9 +17856,7 @@ projects:
       # on each tempest master check for stable-maint visiblity
       - periodic-tempest-dsvm-nnet-ubuntu-xenial-newton
       - periodic-tempest-dsvm-neutron-full-ubuntu-xenial-newton
-      - periodic-tempest-dsvm-nnet-ubuntu-xenial-ocata
       - periodic-tempest-dsvm-neutron-full-ubuntu-xenial-ocata
-      - periodic-tempest-dsvm-nnet-ubuntu-xenial-pike
       - periodic-tempest-dsvm-neutron-full-ubuntu-xenial-pike
     periodic:
       - periodic-tempest-dsvm-full-test-accounts-ubuntu-xenial-master