From 4da7e84dd581f3fda8fa756ecd9146e43143969f Mon Sep 17 00:00:00 2001
From: Ken'ichi Ohmichi <oomichi@mxs.nes.nec.co.jp>
Date: Mon, 22 Sep 2014 01:27:50 +0000
Subject: [PATCH] Remove Nova v3 API tests

Nova v3 API has disappeared in Juno cycle, and we don't need to test
the API now. This patch removes Nova v3 API tests.

Change-Id: If63dcdb2d05aa0fab0b6848a1248b6678f1ee9ad
---
 .../config/devstack-gate.yaml                 | 34 -------------------
 .../openstack_project/files/zuul/layout.yaml  |  6 ----
 2 files changed, 40 deletions(-)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
index cbf8b56870..c35110b303 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
@@ -793,39 +793,6 @@
       - devstack-logs
       - console-log
 
-- job-template:
-    name: '{pipeline}-tempest-dsvm-nova-v3-full{branch-designator}'
-    node: '{node}'
-
-    wrappers:
-      - build-timeout:
-          timeout: 125
-      - timestamps
-
-    builders:
-      - link-logs
-      - net-info
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_FULL=1
-          export DEVSTACK_GATE_TEMPEST_NOVA_V3_API=1
-          export BRANCH_OVERRIDE={branch-override}
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          export OVERRIDE_TEMPEST_PROJECT_BRANCH=master
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-
-    publishers:
-      - devstack-logs
-      - console-log
-
-
 - job-template:
     name: '{pipeline}-tempest-dsvm-postgres-zeromq-full{branch-designator}'
     node: '{node}'
@@ -1488,5 +1455,4 @@
       - '{pipeline}-tempest-dsvm-neutron-full-non-isolated{branch-designator}'
       - '{pipeline}-tempest-dsvm-keystonev3-full{branch-designator}'
       - '{pipeline}-tempest-dsvm-neutron-keystonev3-full{branch-designator}'
-      - '{pipeline}-tempest-dsvm-nova-v3-full{branch-designator}'
       - '{pipeline}-tempest-dsvm-full-ceph{branch-designator}'
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 5023e862a9..dee47f2548 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -513,8 +513,6 @@ jobs:
     voting: false
   - name: ^(gate|check)-tempest-dsvm-cells-full$
     voting: false
-  - name: ^(gate|check)-tempest-dsvm-nova-v3-full$
-    branch: ^(?!stable/havana).*$
   - name: ^(gate|check)-grenade-dsvm$
     branch: ^(?!stable/havana).*$
   - name: ^(gate|check)-grenade-dsvm-neutron$
@@ -1284,7 +1282,6 @@ projects:
       - gate-grenade-dsvm-forward
       - check-tempest-dsvm-cells-full
       - check-tempest-dsvm-neutron-pg
-      - check-tempest-dsvm-nova-v3-full
       - gate-nova-pip-missing-reqs
     silent:
       - check-tempest-dsvm-docker
@@ -2520,7 +2517,6 @@ projects:
       - check-tempest-dsvm-zaqar
       - check-tempest-dsvm-keystonev3-full
       - check-tempest-dsvm-neutron-keystonev3-full
-      - check-tempest-dsvm-nova-v3-full
       - gate-tempest-dsvm-ceilometer-mongodb
       - gate-tempest-dsvm-ceilometer-mongodb-full
       # havana compat jobs for tempest master (non voting)
@@ -2552,7 +2548,6 @@ projects:
       - periodic-tempest-dsvm-neutron-full-non-isolated-master
       - periodic-tempest-dsvm-all-master
       - periodic-tempest-dsvm-stress-master
-      - periodic-tempest-dsvm-nova-v3-full-master
 
   - name: openstack/tempest-lib
     template:
@@ -2591,7 +2586,6 @@ projects:
       - gate-grenade-dsvm-forward
       - check-tempest-dsvm-keystonev3-full
       - check-tempest-dsvm-neutron-keystonev3-full
-      - check-tempest-dsvm-nova-v3-full
     post:
       - tempest-lib-docs
       - tempest-lib-coverage