From 8e378a0b19ccf79b5f656817b38cfa5e45d4dafc Mon Sep 17 00:00:00 2001 From: Khai Do Date: Sat, 14 Dec 2013 00:18:17 +0000 Subject: [PATCH] use parameters from project.yaml The maven parameter was not used in the jobs so removing it. The node and tarball-site param should be used in the template instead of literal string. Change-Id: I8d65bd237828ab6e464089e437e11513b5d88f5d --- .../jenkins_job_builder/config/jenkins-plugin-jobs.yaml | 8 ++++---- .../jenkins_job_builder/config/maven-plugin-jobs.yaml | 6 +++--- .../files/jenkins_job_builder/config/projects.yaml | 3 --- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml index 67a98d3c1e..5348f2548f 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml @@ -1,9 +1,9 @@ -# usig a freestyle project to work around jenkins bug: +# usig a freestyle project to work around jenkins bug: # https://issues.jenkins-ci.org/browse/JENKINS-14193 - job-template: name: 'gate-{name}-build' - node: precise + node: '{node}' wrappers: - timeout: @@ -30,7 +30,7 @@ - job-template: name: '{name}-hpi-artifact' - node: precise + node: '{node}' wrappers: - timeout: @@ -56,7 +56,7 @@ publishers: - war: - site: 'tarballs.openstack.org' + site: '{tarball-site}' warfile: 'target/{name}-${{PROJECT_VER}}.hpi' target: 'tarballs/ci/{name}' - console-log diff --git a/modules/openstack_project/files/jenkins_job_builder/config/maven-plugin-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/maven-plugin-jobs.yaml index a5b7a6040b..e9dd305cc6 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/maven-plugin-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/maven-plugin-jobs.yaml @@ -3,7 +3,7 @@ - job-template: name: 'gate-{name}-build' - node: precise + node: '{node}' wrappers: - timeout: @@ -30,7 +30,7 @@ - job-template: name: '{name}-localrepo-upload' - node: precise + node: '{node}' wrappers: - timeout: @@ -54,7 +54,7 @@ publishers: - war: - site: 'tarballs.openstack.org' + site: '{tarball-site}' warfile: 'target/{name}-${{PROJECT_VER}}.jar' target: 'tarballs/ci/{name}' - console-log 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 fe7bf11317..ff6ca594bf 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -359,7 +359,6 @@ - project: name: gearman-plugin - maven-group-id: org.jenkins-ci.plugins github-org: openstack-infra node: precise tarball-site: tarballs.openstack.org @@ -369,7 +368,6 @@ - project: name: clouddocs-maven-plugin - maven-group-id: com.rackspace.cloud.api github-org: stackforge node: precise tarball-site: tarballs.openstack.org @@ -379,7 +377,6 @@ - project: name: zmq-event-publisher - maven-group-id: org.jenkins-ci.plugins github-org: openstack-infra node: precise tarball-site: tarballs.openstack.org