From 08cb8010e2d543cdf537512700e8f7a1b23a79ce Mon Sep 17 00:00:00 2001 From: Paul Michali Date: Fri, 6 Mar 2015 07:26:08 -0500 Subject: [PATCH] Partial revert of func job setup for VPNaaS repo As part of enabling a new experimental functional test job for the neutron-vpnaas repo, file filtering was incorrectly added to the existing OpenSwan and new StrongSwan functional jobs. The original intent was to have the StrongSwan job run tests in the parent directory (shared tests) and the strongswan sub-directory, and to have the OpenSwan job run tests in the parent directory and the openswan sub-directory. This wrong on two counts. First, these file filters are used to determine what files changed will *trigger* the job. As it currently stands, these filters are detecting only functional test file changes and not neutron-vpnaas production code changes. Second, to get the jobs to run on the desired set of functional test files, shared test modules will be put in a sub-directory, and not in the parent directory. Changes to tox.ini and hook files in the repo are being used to select the right directories for testing. Change-Id: I214f2c9610aedac2192d6bb777cd485688f938c6 Partial-Bug: 1424757 --- zuul/layout.yaml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 895a4b5494..85c4654ad7 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -683,19 +683,8 @@ jobs: - name: ^(gate|check)-tempest-dsvm-networking-odl branch: ^(?!stable) voting: false - - name: ^(gate|check)-neutron-vpnaas-dsvm-functional$ -# 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 + - name: ^check-neutron-vpnaas-dsvm-functional-sswan$ 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) - name: ^(gate|check)-gerrit-unittests$ branch: ^openstack/2\.4.*$