From e16d0d11b571ae8810861fc02b51843292ebe532 Mon Sep 17 00:00:00 2001 From: Peter Portante Date: Mon, 5 May 2014 13:56:05 -0400 Subject: [PATCH] Fix working swift "in-process" funtional test runs The swift code base now allows for running all of the functional tests against a set of in-process servers. The functional tests, which are nose based, run entirely with-in the process from which nose is invoked, allowing for coverage collection and / or easier test development. These tests had been added using the gate-{name}-unittest-{env} template which assumes that the env name will be prefixed with 'py' before passing it to tox. 'pyfunc' doesn't exist as the target so switch to using the gate-{name}-tox-{envlist} template which does not assume anything about the tox target. The ability to run these "in-process" functional tests is only available post-Icehouse. Change-Id: I77d47dffa429ffc90ab732c518dc14cbf22f7017 --- .../files/jenkins_job_builder/config/projects.yaml | 4 ++-- .../config/{swift-functional.yaml => swift.yaml} | 0 modules/openstack_project/files/zuul/layout.yaml | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) rename modules/openstack_project/files/jenkins_job_builder/config/{swift-functional.yaml => swift.yaml} (100%) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml index 59b8c9ca7e..76ae0079c0 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -1226,8 +1226,8 @@ jobs: - python-jobs - openstack-publish-jobs - - gate-{name}-unittests-{env}: - env: func + - 'gate-{name}-tox-{envlist}': + envlist: func - '{pipeline}-swift-dsvm-functional{branch-designator}': pipeline: gate node: devstack-precise diff --git a/modules/openstack_project/files/jenkins_job_builder/config/swift-functional.yaml b/modules/openstack_project/files/jenkins_job_builder/config/swift.yaml similarity index 100% rename from modules/openstack_project/files/jenkins_job_builder/config/swift-functional.yaml rename to modules/openstack_project/files/jenkins_job_builder/config/swift.yaml diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index ec72ed1e37..ecdc75bde8 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -578,7 +578,8 @@ jobs: voting: false - name: gate-heat-templates-dsvm voting: false - - name: gate-swift-unittests-func + - name: gate-swift-tox-func + branch: ^(?!stable/(havana|icehouse)).*$ voting: false # The project list is grouped by type of project, and within each @@ -1037,14 +1038,14 @@ projects: - name: check-requirements - name: integrated-gate check: - - gate-swift-unittests-func + - gate-swift-tox-func - check-swift-dsvm-functional - check-devstack-dsvm-cells - check-tempest-dsvm-postgres-full - gate-tempest-dsvm-large-ops - gate-tempest-dsvm-neutron-large-ops gate: - - gate-swift-unittests-func + - gate-swift-tox-func - gate-swift-dsvm-functional - gate-devstack-dsvm-cells - gate-tempest-dsvm-postgres-full