From 8627ad9551f009cba2a285a111bec4e925c4f8f4 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Thu, 8 Dec 2016 19:27:15 +0100
Subject: [PATCH] Merge nova-docker tempest jobs

gate-tempest-dsvm-docker-centos7-nv is a duplicate of
gate-tempest-dsvm-docker-{node}-nv template, remove the duplicate
and use the template instead.

Change-Id: I9c181924b3f0a8e0b9a7aab598650ff1ab826b7d
---
 jenkins/jobs/nova-docker.yaml | 46 -----------------------------------
 jenkins/jobs/projects.yaml    |  1 +
 zuul/layout.yaml              |  2 +-
 3 files changed, 2 insertions(+), 47 deletions(-)

diff --git a/jenkins/jobs/nova-docker.yaml b/jenkins/jobs/nova-docker.yaml
index d1b12f79dc..cade3b8216 100644
--- a/jenkins/jobs/nova-docker.yaml
+++ b/jenkins/jobs/nova-docker.yaml
@@ -44,49 +44,3 @@
     publishers:
       - devstack-logs
       - console-log
-
-- job:
-    name: gate-tempest-dsvm-docker-centos7-nv
-    node: centos-7
-
-    wrappers:
-      - build-timeout:
-          timeout: 70
-      - timestamps
-
-    builders:
-      - link-logs
-      - net-info
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          function gate_hook {
-              $BASE/new/nova-docker/contrib/devstack/gate_hook.sh
-          }
-
-          export -f gate_hook
-
-          function pre_test_hook {
-              if [ -f $BASE/new/nova-docker/contrib/devstack/pre_test_hook.sh ] ; then
-                  $BASE/new/nova-docker/contrib/devstack/pre_test_hook.sh
-              fi
-          }
-
-          export -f pre_test_hook
-
-          function post_test_hook {
-              if [ -f $BASE/new/nova-docker/contrib/devstack/post_test_hook.sh ] ; then
-                  $BASE/new/nova-docker/contrib/devstack/post_test_hook.sh
-              fi
-          }
-
-          export -f post_test_hook
-          export PYTHONUNBUFFERED=true
-          export PROJECTS="openstack/nova-docker $PROJECTS"
-
-          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
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index dedb21d3cd..af028d92be 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -8597,6 +8597,7 @@
           node:
             - ubuntu-trusty
             - ubuntu-xenial
+            - centos-7
 
 - project:
     name: nova-dpm
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 915929e415..34a0e12132 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -12542,7 +12542,7 @@ projects:
     check:
       - gate-tempest-dsvm-docker-ubuntu-trusty-nv
       - gate-tempest-dsvm-docker-ubuntu-xenial-nv
-      - gate-tempest-dsvm-docker-centos7-nv
+      - gate-tempest-dsvm-docker-centos-7-nv
 
   - name: openstack/nova-dpm
     template: