From f39069499049f32d67ddb7a5f36c58d80ad05dbd Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Fri, 10 Jan 2014 06:50:55 +0800 Subject: [PATCH] Move nova/savanna to only use bare-precise nodes The earlier changes were faulty as it's not actually possible to select precise||bare-precise nodes because zuul needs to send Jenkins the offline-on-complete flag with the job request (and can not know which node will run it). Change-Id: Ice0adbaa5629ee289f39f7bcddee7e01bfb2b4c3 --- .../files/jenkins_job_builder/config/projects.yaml | 4 ++-- modules/openstack_project/files/zuul/layout.yaml | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 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 ef05235c00..99c8cc06ff 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -162,7 +162,7 @@ - project: name: savanna github-org: openstack - node: 'bare-precise || precise' + node: bare-precise tarball-site: tarballs.openstack.org doc-publisher-site: docs.openstack.org @@ -624,7 +624,7 @@ - project: name: nova github-org: openstack - node: 'bare-precise || precise' + node: bare-precise tarball-site: tarballs.openstack.org doc-publisher-site: docs.openstack.org diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index f083e7aa34..d46d278531 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -183,12 +183,24 @@ jobs: parameter-function: set_log_url - name: ^.*(dsvm|devstack-vm).*$ parameter-function: single_use_node +# begin section to deal with transition to bare-precise - name: gate-config-layout parameter-function: single_use_node - name: ci-docs parameter-function: single_use_node - name: gate-ci-docs parameter-function: single_use_node + - name: '^gate-(nova|savanna)-docs$' + parameter-function: single_use_node + - name: '^gate-(nova|savanna)-pep8$' + parameter-function: single_use_node + - name: '^gate-(nova|savanna)-pylint$' + parameter-function: single_use_node + - name: '^gate-(nova|savanna)-python27$' + parameter-function: single_use_node + - name: '^(nova|savanna)-coverage$' + parameter-function: single_use_node +# end section to deal with transition to bare-precise - name: ^(gate|check)-requirements-integration-dsvm$ branch: ^(?!stable/grizzly).*$ - name: ^(gate|check)-tempest-dsvm-neutron-pg$