From 83e3264d614766f7fe8c621f9ec2175d2cc9fb04 Mon Sep 17 00:00:00 2001
From: Kevin Fox <kevin@efox.cc>
Date: Thu, 20 Oct 2016 16:12:33 -0700
Subject: [PATCH] Add kolla-kubernetes multinode job & remove dead code

This PS adds a multinode test job and removes the tox code that was
just a no-op.

Change-Id: Ic3b411553af522d8800d2aaf131c7790c672bded
---
 jenkins/jobs/kolla-kubernetes.yaml | 2 --
 jenkins/jobs/projects.yaml         | 8 ++++++++
 zuul/layout.yaml                   | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/jenkins/jobs/kolla-kubernetes.yaml b/jenkins/jobs/kolla-kubernetes.yaml
index 20ea19a04e..9cb3f575e0 100644
--- a/jenkins/jobs/kolla-kubernetes.yaml
+++ b/jenkins/jobs/kolla-kubernetes.yaml
@@ -15,7 +15,6 @@
       - shell: |
           #!/bin/bash -xe
           tools/setup_gate.sh {action} {distro} {type} {config} {node} shell
-          tox -e {action}-{distro}-{type}
 
     publishers:
       - devstack-logs
@@ -38,7 +37,6 @@
       - shell: |
           #!/bin/bash -xe
           tools/setup_gate.sh deploy centos binary {config} {node} ansible
-          tox -e deploy-centos-binary
 
     publishers:
       - devstack-logs
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 2fc342f3d9..846ec83c84 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -6105,6 +6105,14 @@
       - pypi-jobs
       - openstack-publish-jobs
       - openstack-releasenotes-jobs
+      - '{pipeline}-kolla-kubernetes-{action}-{distro}-{type}-{config}{job-suffix}':
+          action: deploy
+          config: ceph-multi
+          distro: centos
+          node: 'centos-7-2-node'
+          pipeline: gate
+          type: binary
+          job-suffix: '-nv'
       - '{pipeline}-kolla-kubernetes-{action}-{distro}-{type}-{config}{job-suffix}':
           action: deploy
           config:
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 249354eb28..595a50d814 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -10628,6 +10628,7 @@ projects:
       - name: publish-to-pypi
       - name: release-notes-jobs
     experimental:
+      - gate-kolla-kubernetes-deploy-centos-binary-ceph-multi-nv
       - gate-kolla-kubernetes-deploy-centos-binary-ceph-nv
       - gate-kolla-kubernetes-deploy-centos-binary-iscsi-nv
       - gate-kolla-kubernetes-deploy-ubuntu-binary-ceph-nv