From cc792bb0385bc3361040efed54aa5ef8b7c97a8b Mon Sep 17 00:00:00 2001 From: Michael Krotscheck Date: Thu, 10 Jul 2014 15:53:29 -0700 Subject: [PATCH] Updated vinz build to use new test modules Update vinz-webclient to use new build modules. Change-Id: I6670d5fb6cedf2b79868f8fa5f0106c742bd28ec --- .../files/jenkins_job_builder/config/projects.yaml | 5 ++++- modules/openstack_project/files/zuul/layout.yaml | 12 +++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) 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 2295532a13..c0c46194c1 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -1593,7 +1593,10 @@ tarball-site: tarballs.openstack.org jobs: - - gate-{name}-js-unittests + - gate-{name}-js-test-unit + - gate-{name}-js-test-integration + - gate-{name}-js-test-functional + - gate-{name}-js-draft - '{name}-js-release-{branch-designator}': branch-designator: 'master' - '{name}-js-release-{branch-designator}': diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 96477c2ba1..2ef017c969 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -581,9 +581,6 @@ jobs: - name: ^gate-.*-js-draft parameter-function: set_node_options_default_trusty success-pattern: http://docs-draft.openstack.org/{build.parameters[LOG_PATH]}/dist/ - - name: gate-vinz-webclient-js-unittests - parameter-function: set_node_options_default_trusty - success-pattern: http://docs-draft.openstack.org/{build.parameters[LOG_PATH]}/dist/ - name: infra-publications-publish branch: ^(?!master).*$ - name: ^gate-.*-requirements$ @@ -3036,9 +3033,14 @@ projects: - name: openstack-infra/vinz-webclient check: - - gate-vinz-webclient-js-unittests + - gate-vinz-webclient-js-test-unit + - gate-vinz-webclient-js-test-integration + - gate-vinz-webclient-js-test-functional + - gate-vinz-webclient-js-draft gate: - - gate-vinz-webclient-js-unittests + - gate-vinz-webclient-js-test-unit + - gate-vinz-webclient-js-test-integration + - gate-vinz-webclient-js-test-functional post: - vinz-webclient-js-release-branch release: