From 63ebcbc317ff2e5b366ea1bf0ede689ad504277f Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 21 Feb 2013 11:26:00 -0800 Subject: [PATCH] Do not run Maven jobs on jclouds slaves. Maven jobs are not currently able to build on jclouds slaves. As soon as the Maven build portion of these jobs starts exceptions are thrown and the jobs fail. Work around this by forcing Maven jobs to run on slaves without the jclouds node label. Change-Id: I5dc6b9c5109e9095a1636b7fc0b92c4df79f609b Reviewed-on: https://review.openstack.org/22587 Reviewed-by: Paul Belanger Reviewed-by: James E. Blair Reviewed-by: Khai Do Approved: James E. Blair Tested-by: Jenkins --- .../jenkins_job_builder/config/api-jobs.yaml | 16 +++++----- .../config/gearman-plugin.yaml | 2 +- .../jenkins_job_builder/config/gerrit.yaml | 6 ++-- .../jenkins_job_builder/config/manuals.yaml | 32 +++++++++---------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml index b0930d04b5..7d1ab9c629 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml @@ -4,7 +4,7 @@ name: openstack-api-programming project-type: maven concurrent: true - node: precise + node: precise && !jclouds wrappers: - timeout: @@ -46,7 +46,7 @@ name: openstack-api-quick-start project-type: maven concurrent: false - node: precise + node: precise && !jclouds triggers: - zuul-post @@ -77,7 +77,7 @@ name: openstack-api-ref project-type: maven concurrent: false - node: precise + node: precise && !jclouds triggers: - zuul-post @@ -131,7 +131,7 @@ name: network-api-v10 project-type: maven concurrent: false - node: precise + node: precise && !jclouds triggers: - zuul-post @@ -160,7 +160,7 @@ name: openstack-object-api-doc project-type: maven concurrent: false - node: precise + node: precise && !jclouds triggers: - zuul-post @@ -189,7 +189,7 @@ name: openstack-compute-api-doc project-type: maven concurrent: false - node: precise + node: precise && !jclouds triggers: - zuul-post @@ -240,7 +240,7 @@ name: identity-api-v20 project-type: maven concurrent: false - node: precise + node: precise && !jclouds triggers: - zuul-post @@ -270,7 +270,7 @@ name: image-api-v11 project-type: maven concurrent: false - node: precise + node: precise && !jclouds triggers: - zuul-post diff --git a/modules/openstack_project/files/jenkins_job_builder/config/gearman-plugin.yaml b/modules/openstack_project/files/jenkins_job_builder/config/gearman-plugin.yaml index 4f171d2f1b..d903373fce 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/gearman-plugin.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/gearman-plugin.yaml @@ -1,7 +1,7 @@ - job: name: gate-gearman-plugin-build project-type: maven - node: precise + node: precise && !jclouds triggers: - zuul diff --git a/modules/openstack_project/files/jenkins_job_builder/config/gerrit.yaml b/modules/openstack_project/files/jenkins_job_builder/config/gerrit.yaml index 68533e5fba..3be772e6f6 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/gerrit.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/gerrit.yaml @@ -1,7 +1,7 @@ - job: name: check-gerrit-unittests project-type: maven - node: precise + node: precise && !jclouds wrappers: - timeout: @@ -36,7 +36,7 @@ - job: name: gate-gerrit-unittests project-type: maven - node: precise + node: precise && !jclouds wrappers: - timeout: @@ -66,7 +66,7 @@ - job: name: gerrit-package project-type: maven - node: precise + node: precise && !jclouds wrappers: - timeout: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml b/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml index ab2275487e..4d713daa4c 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml @@ -1,7 +1,7 @@ - job: name: gate-openstack-cli-guide project-type: maven - node: precise + node: precise && !jclouds triggers: - zuul @@ -44,7 +44,7 @@ - job: name: openstack-cli-guide project-type: maven - node: precise + node: precise && !jclouds triggers: - zuul-post @@ -72,7 +72,7 @@ - job: name: openstack-basic-install project-type: maven - node: precise + node: precise && !jclouds triggers: - zuul-post @@ -100,7 +100,7 @@ - job: name: netconn-api-v20 project-type: maven - node: precise + node: precise && !jclouds triggers: - zuul-post @@ -129,7 +129,7 @@ name: volume-api project-type: maven concurrent: true - node: precise + node: precise && !jclouds wrappers: - timeout: @@ -163,7 +163,7 @@ name: image-api-v20 project-type: maven concurrent: true - node: precise + node: precise && !jclouds wrappers: - timeout: @@ -203,7 +203,7 @@ - job: name: openstack-glossary project-type: maven - node: precise + node: precise && !jclouds triggers: - zuul-post @@ -232,7 +232,7 @@ name: openstack-admin-manual-compute project-type: maven concurrent: false - node: precise + node: precise && !jclouds triggers: - zuul-post @@ -266,7 +266,7 @@ name: openstack-admin-manual-keystone-diablo project-type: maven concurrent: false - node: precise + node: precise && !jclouds triggers: - zuul-post @@ -292,7 +292,7 @@ name: openstack-admin-manual-netconn project-type: maven concurrent: false - node: precise + node: precise && !jclouds triggers: - zuul-post @@ -326,7 +326,7 @@ name: openstack-admin-manual-object project-type: maven concurrent: false - node: precise + node: precise && !jclouds triggers: - zuul-post @@ -360,7 +360,7 @@ name: openstack-admin-manuals-diablo project-type: maven concurrent: false - node: precise + node: precise && !jclouds triggers: - zuul-post @@ -386,7 +386,7 @@ - job: name: openstack-docs-site concurrent: false - node: precise + node: precise && !jclouds triggers: - zuul-post @@ -413,7 +413,7 @@ name: openstack-ha-guide project-type: maven concurrent: false - node: precise + node: precise && !jclouds triggers: - zuul-post @@ -449,7 +449,7 @@ name: openstack-install-deploy-guide-apt-fedora project-type: maven concurrent: false - node: precise + node: precise && !jclouds triggers: - zuul-post @@ -483,7 +483,7 @@ name: openstack-install-deploy-guide-ubuntu project-type: maven concurrent: false - node: precise + node: precise && !jclouds triggers: - zuul-post