From 2fe26e3ae8b88349b2304c88dc7a38cdb2c204ed Mon Sep 17 00:00:00 2001
From: Louis Fourie <louis.fourie@huawei.com>
Date: Tue, 27 Dec 2016 11:11:07 -0800
Subject: [PATCH] Add multinode tempest test coverage in networking-sfc

Also add multinode test to grafana dashboard.

Change-Id: I8b2265d326b8a3cd7350c10429a011d3fb6254de
---
 grafana/networking-sfc.yaml      |  1 +
 jenkins/jobs/networking-sfc.yaml | 63 ++++++++++++++++++++++++++++++++
 jenkins/jobs/projects.yaml       |  6 +++
 zuul/layout.yaml                 |  1 +
 4 files changed, 71 insertions(+)

diff --git a/grafana/networking-sfc.yaml b/grafana/networking-sfc.yaml
index 820cc69bac..c9d4f684f6 100644
--- a/grafana/networking-sfc.yaml
+++ b/grafana/networking-sfc.yaml
@@ -43,4 +43,5 @@ dashboard:
           targets:
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-tempest-dsvm-networking-sfc-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-tempest-dsvm-networking-sfc-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-networking-sfc-ubuntu-xenial')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.gate.job.gate-networking-sfc-functional-dsvm-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.gate.job.gate-networking-sfc-functional-dsvm-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-networking-sfc-functional-dsvm')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-sfc-multinode-ubuntu-xenial-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-networking-sfc-multinode-ubuntu-xenial-nv.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-networking-sfc-multinode-ubuntu-xenial-nv')
           type: graph
diff --git a/jenkins/jobs/networking-sfc.yaml b/jenkins/jobs/networking-sfc.yaml
index f7d8b92fbf..837e3c197d 100644
--- a/jenkins/jobs/networking-sfc.yaml
+++ b/jenkins/jobs/networking-sfc.yaml
@@ -115,3 +115,66 @@
     publishers:
       - devstack-logs
       - console-log
+
+- job-template:
+    name: '{pipeline}-tempest-dsvm-networking-sfc-multinode-{node-release}{suffix}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 180
+      - timestamps
+
+    builders:
+      - print-template-name:
+          template-name: "{template-name}"
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_NEUTRON=1
+          # Make sure tempest is installed, but run it out of the post_test_hooks.sh
+          # script from the networking-sfc repository.
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_NOTESTS=1
+
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+          export DEVSTACK_GATE_TOPOLOGY="multinode"
+
+          # Because we are testing a non standard project, add
+          # our project repository. This makes zuul do the right
+          # reference magic for testing changes.
+          export PROJECTS="openstack/networking-sfc $PROJECTS"
+          # Note the actual url here is somewhat irrelevant because it
+          # caches in nodepool, however make it a valid url for
+          # documentation purposes.
+          export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-sfc git://git.openstack.org/openstack/networking-sfc"
+
+          # Keep localrc to be able to set some vars in pre_test_hook
+          export KEEP_LOCALRC=1
+
+          function pre_test_hook {{
+              if [ -f $BASE/new/networking-sfc/devstack/pre_test_hook.sh ] ; then
+                  . $BASE/new/networking-sfc/devstack/pre_test_hook.sh
+              fi
+          }}
+          export -f pre_test_hook
+
+          function post_test_hook {{
+              if [ -f $BASE/new/networking-sfc/devstack/post_test_hook.sh ] ; then
+                  . $BASE/new/networking-sfc/devstack/post_test_hook.sh
+              fi
+          }}
+          export -f post_test_hook
+
+          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 3ad932167f..59181818ab 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -7321,6 +7321,12 @@
           node: ubuntu-xenial
           suffix: ''
           branch-override: default
+      - '{pipeline}-tempest-dsvm-networking-sfc-multinode-{node-release}{suffix}':
+          pipeline: gate
+          node-release: ubuntu-xenial
+          node: ubuntu-xenial-2-node
+          suffix: '-nv'
+          branch-override: default
 
 - project:
     name: networking-vpp
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 03a32f6c59..505157d66a 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -11940,6 +11940,7 @@ projects:
       - gate-networking-sfc-functional-dsvm-ubuntu-xenial
       - gate-tempest-dsvm-networking-sfc-ubuntu-trusty
       - gate-tempest-dsvm-networking-sfc-ubuntu-xenial
+      - gate-tempest-dsvm-networking-sfc-multinode-ubuntu-xenial-nv
     gate:
       - gate-networking-sfc-functional-dsvm-ubuntu-trusty
       - gate-networking-sfc-functional-dsvm-ubuntu-xenial