Merge "Partial revert of func job setup for VPNaaS repo"

This commit is contained in:
Jenkins 2015-03-06 18:36:01 +00:00 committed by Gerrit Code Review
commit c9f4714614

View File

@ -683,19 +683,8 @@ jobs:
- name: ^(gate|check)-tempest-dsvm-networking-odl - name: ^(gate|check)-tempest-dsvm-networking-odl
branch: ^(?!stable) branch: ^(?!stable)
voting: false voting: false
- name: ^(gate|check)-neutron-vpnaas-dsvm-functional$ - name: ^check-neutron-vpnaas-dsvm-functional-sswan$
# Note: This job will run common test cases (first line), and
# OpenSwan specific tests (second line).
files:
- '^neutron_vpnaas/tests/functional/[^/]+\.py$'
- '^neutron_vpnaas/tests/functional/openswan/.+\.py$'
- name: check-neutron-vpnaas-dsvm-functional-sswan
voting: false voting: false
# Note: this job will run common test cases (first line), and
# StrongSwan specific tests (second line).
files:
- '^neutron_vpnaas/tests/functional/[^/]+\.py$'
- '^neutron_vpnaas/tests/functional/strongswan/.+\.py$'
# For Gerrit ver 2.4.x (using maven) # For Gerrit ver 2.4.x (using maven)
- name: ^(gate|check)-gerrit-unittests$ - name: ^(gate|check)-gerrit-unittests$
branch: ^openstack/2\.4.*$ branch: ^openstack/2\.4.*$