Merge "Enable functional test job in openstack ci for neutron-vpnaas"

jenkins/jobs/neutron-vpnaas-functional.yaml

@@ -0,0 +1,44 @@
+- job-template:
+    name: '{pipeline}-neutron-vpnaas-dsvm-functional{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_UNSTACK=1
+          export DEVSTACK_GATE_TIMEOUT=120
+          export DEVSTACK_GATE_TEMPEST=0
+          export DEVSTACK_GATE_EXERCISES=0
+          export DEVSTACK_GATE_NEUTRON=1
+          export DEVSTACK_GATE_INSTALL_TESTONLY=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+
+          function gate_hook {{
+              bash -xe $BASE/new/neutron-vpnaas/neutron_vpnaas/tests/contrib/gate_hook.sh dsvm-functional
+          }}
+          export -f gate_hook
+
+          function post_test_hook {{
+             bash -xe $BASE/new/neutron-vpnaas/neutron_vpnaas/tests/contrib/post_test_hook.sh dsvm-functional
+          }}
+          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:
+      - test-results
+      - devstack-logs
+      - console-log

jenkins/jobs/projects.yaml

@@ -413,6 +413,16 @@
     jobs:
       - python-jobs
       - openstack-publish-jobs
+      - '{pipeline}-neutron-vpnaas-dsvm-functional{branch-designator}':
+          pipeline: gate
+          node: 'devstack-precise || devstack-trusty'
+          branch-designator: ''
+          branch-override: default
+      - '{pipeline}-neutron-vpnaas-dsvm-functional{branch-designator}':
+          pipeline: check
+          node: 'devstack-precise || devstack-trusty'
+          branch-designator: ''
+          branch-override: default
 
 - project:
     name: nova

zuul/layout.yaml

@@ -611,6 +611,8 @@ jobs:
     branch: ^(?!stable/icehouse).*$
   - name: gate-designate-dsvm-bind9
     branch: ^(?!stable/(?:icehouse|juno)).*$
+  - name: check-neutron-vpnaas-dsvm-functional
+    voting: false
 # For Gerrit ver 2.4.x (using maven)
   - name: ^(gate|check)-gerrit-unittests$
     branch: ^openstack/2\.4.*$
@@ -1351,6 +1353,8 @@ projects:
       - name: merge-check
       - name: python-jobs
       - name: openstack-server-release-jobs
+    experimental:
+      - check-neutron-vpnaas-dsvm-functional
 
   - name: openstack/nova
     template: