Merge "Create experimental job for all neutron-vpnaas tests"

jenkins/jobs/neutron-vpnaas.yaml

@@ -87,3 +87,48 @@
       - test-results
       - devstack-logs
       - console-log
+
+- job-template:
+    name: '{pipeline}-neutron-vpnaas-test-dsvm-{vpnaastest}{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 {vpnaastest}
+          }}
+          export -f gate_hook
+
+          function post_test_hook {{
+             bash -xe $BASE/new/neutron-vpnaas/neutron_vpnaas/tests/contrib/post_test_hook.sh {vpnaastest}
+          }}
+          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

@@ -1104,6 +1104,24 @@
           node: 'devstack-precise || devstack-trusty'
           branch-designator: ''
           branch-override: default
+      - '{pipeline}-neutron-vpnaas-test-dsvm-{vpnaastest}{branch-designator}':
+          pipeline: gate
+          node: 'devstack-precise || devstack-trusty'
+          vpnaastest: functional
+          branch-designator: ''
+          branch-override: default
+      - '{pipeline}-neutron-vpnaas-test-dsvm-{vpnaastest}{branch-designator}':
+          pipeline: gate
+          node: 'devstack-precise || devstack-trusty'
+          vpnaastest: functional-sswan
+          branch-designator: ''
+          branch-override: default
+      - '{pipeline}-neutron-vpnaas-test-dsvm-{vpnaastest}{branch-designator}':
+          pipeline: gate
+          node: 'devstack-precise || devstack-trusty'
+          vpnaastest: api
+          branch-designator: ''
+          branch-override: default
 
 - project:
     name: nova

zuul/layout.yaml

@@ -2846,6 +2846,9 @@ projects:
     periodic-qa:
       - gate-tempest-dsvm-neutron-pg-full
     experimental:
+      - gate-neutron-vpnaas-test-dsvm-api
+      - gate-neutron-vpnaas-test-dsvm-functional
+      - gate-neutron-vpnaas-test-dsvm-functional-sswan
       - gate-grenade-dsvm-neutron-vpnaas
       - gate-tempest-dsvm-neutron-pg-full
     post: