From 9951b61010083ba37859d2491f64bb0c9596ffe7 Mon Sep 17 00:00:00 2001 From: Craig Bryant Date: Fri, 18 Jul 2014 15:51:32 -0600 Subject: [PATCH] Switch monasca-common and monasca-thresh to bare-trusty Switch to bare-trusty in order to use maven 3. bare-precise only has maven 2. Change-Id: I0e71a495f8aa194b0a6c4c91531fc56401113842 --- .../files/jenkins_job_builder/config/projects.yaml | 4 ++-- modules/openstack_project/files/zuul/layout.yaml | 8 ++++++++ 2 files changed, 10 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 780262c948..d9dc537b25 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -110,7 +110,7 @@ - project: name: monasca-common github-org: stackforge - node: 'bare-precise || bare-trusty' + node: bare-trusty tarball-site: tarballs.openstack.org jobs: @@ -129,7 +129,7 @@ - project: name: monasca-thresh github-org: stackforge - node: 'bare-precise || bare-trusty' + node: bare-trusty tarball-site: tarballs.openstack.org jobs: diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 8f804eebe7..f2c349e75d 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -426,6 +426,14 @@ jobs: parameter-function: set_node_options_default_trusty - name: ^gate-trove-.*$ parameter-function: set_node_options_default_trusty + - name: ^gate-monasca-common.*$ + parameter-function: set_node_options_default_trusty + - name: ^monasca-common.*$ + parameter-function: set_node_options_default_trusty + - name: ^gate-monasca-thresh.*$ + parameter-function: set_node_options_default_trusty + - name: ^monasca-thresh.*$ + parameter-function: set_node_options_default_trusty - name: ^gate-python-cinderclient.*$ parameter-function: set_node_options_default_trusty - name: ^gate-python-glanceclient.*$