From 167f3285b462f740dd8ce55eefc5be7b22944af3 Mon Sep 17 00:00:00 2001
From: JinJingLin <linjjwx@cn.ibm.com>
Date: Mon, 4 Jul 2016 00:43:58 -0500
Subject: [PATCH] Enable Neutron VPNaaS API CI tests

VPNaaS API CI test is not enabled since the current api test code has some
issues, however our team has fixed it in this patch:
https://review.openstack.org/#/c/335838/, and also vpnaas project need this
API tests, so here create a new API CI job to enable vpnaas api CI tests.

Related-bug: #1598652

Change-Id: I38bc7087fe3cb94cfd532877b2a42441c3733620
---
 jenkins/jobs/neutron-vpnaas.yaml | 52 ++++++++++++++++++++++++++++++++
 jenkins/jobs/projects.yaml       |  6 ++++
 zuul/layout.yaml                 |  1 +
 3 files changed, 59 insertions(+)

diff --git a/jenkins/jobs/neutron-vpnaas.yaml b/jenkins/jobs/neutron-vpnaas.yaml
index 8d25dbe16b..91b81212fc 100644
--- a/jenkins/jobs/neutron-vpnaas.yaml
+++ b/jenkins/jobs/neutron-vpnaas.yaml
@@ -119,3 +119,55 @@
       - test-results
       - devstack-logs
       - console-log
+
+- job-template:
+    name: '{pipeline}-neutron-vpnaas-dsvm-api{which}{job-suffix}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 130
+      - 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_UNSTACK=0
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_EXERCISES=0
+          export DEVSTACK_GATE_NEUTRON=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+
+          if [ "$ZUUL_BRANCH" == "stable/liberty" -o "$ZUUL_BRANCH" == "stable/mitaka" ] ; then
+              export DEVSTACK_GATE_TEMPEST_NOTESTS=1
+              export DEVSTACK_GATE_INSTALL_TESTONLY=1
+          else
+              export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
+              export DEVSTACK_GATE_TEMPEST_REGEX="^neutron_vpnaas.tests.tempest.api\."
+
+          function gate_hook {{
+              bash -xe $BASE/new/neutron-vpnaas/neutron_vpnaas/test/contrib/gate_hook.sh api{which}
+          }}
+          export -f gate_hook
+
+          function post_gate_hook {{
+              bash -xe $BASE/new/neutron-vpnaas/neutron_vpnaas/test/contrib/post_gate_hook.sh api{which}
+          }}
+          export -f post_gate_hook
+
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+
+    publishers:
+      - test-results
+      - devstack-logs
+      - console-log
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 5dd3b5e14f..e27e492a64 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -4389,6 +4389,12 @@
           node: ubuntu-trusty
           job-suffix: ''
           branch-override: default
+      - '{pipeline}-neutron-vpnaas-dsvm-api{which}{job-suffix}':
+          pipeline: gate
+          node: ubuntu-trusty
+          job-suffix: '-nv'
+          branch-override: default
+          which: ''
 
 - project:
     name: nodepool
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index b8d05fe17b..5b39cd0ab8 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -8328,6 +8328,7 @@ projects:
       - gate-tempest-dsvm-neutron-full
       - gate-neutron-vpnaas-dsvm-functional
       - gate-neutron-vpnaas-dsvm-functional-sswan
+      - gate-neutron-vpnaas-dsvm-api-nv
     gate:
       - gate-tempest-dsvm-neutron-full
       - gate-neutron-vpnaas-dsvm-functional