opendev/system-config
Code Issues Proposed changes

use parameters from project.yaml

Browse Source 
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
This commit is contained in:
Khai Do 2013-12-14 00:18:17 +00:00
parent e20f96f782
commit 8e378a0b19
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml
View File

@ -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 # https://issues.jenkins-ci.org/browse/JENKINS-14193
- job-template: - job-template:
name: 'gate-{name}-build' name: 'gate-{name}-build'
node: precise node: '{node}'
wrappers: wrappers:
- timeout: - timeout:
@ -30,7 +30,7 @@
- job-template: - job-template:
name: '{name}-hpi-artifact' name: '{name}-hpi-artifact'
node: precise node: '{node}'
wrappers: wrappers:
- timeout: - timeout:
@ -56,7 +56,7 @@
publishers: publishers:
- war: - war:
site: 'tarballs.openstack.org' site: '{tarball-site}'
warfile: 'target/{name}-${{PROJECT_VER}}.hpi' warfile: 'target/{name}-${{PROJECT_VER}}.hpi'
target: 'tarballs/ci/{name}' target: 'tarballs/ci/{name}'
- console-log - console-log

6
modules/openstack_project/files/jenkins_job_builder/config/maven-plugin-jobs.yaml
View File

@ -3,7 +3,7 @@
- job-template: - job-template:
name: 'gate-{name}-build' name: 'gate-{name}-build'
node: precise node: '{node}'
wrappers: wrappers:
- timeout: - timeout:
@ -30,7 +30,7 @@
- job-template: - job-template:
name: '{name}-localrepo-upload' name: '{name}-localrepo-upload'
node: precise node: '{node}'
wrappers: wrappers:
- timeout: - timeout:
@ -54,7 +54,7 @@
publishers: publishers:
- war: - war:
site: 'tarballs.openstack.org' site: '{tarball-site}'
warfile: 'target/{name}-${{PROJECT_VER}}.jar' warfile: 'target/{name}-${{PROJECT_VER}}.jar'
target: 'tarballs/ci/{name}' target: 'tarballs/ci/{name}'
- console-log - console-log

3
modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
View File

@ -359,7 +359,6 @@
- project: - project:
name: gearman-plugin name: gearman-plugin
maven-group-id: org.jenkins-ci.plugins
github-org: openstack-infra github-org: openstack-infra
node: precise node: precise
tarball-site: tarballs.openstack.org tarball-site: tarballs.openstack.org
@ -369,7 +368,6 @@
- project: - project:
name: clouddocs-maven-plugin name: clouddocs-maven-plugin
maven-group-id: com.rackspace.cloud.api
github-org: stackforge github-org: stackforge
node: precise node: precise
tarball-site: tarballs.openstack.org tarball-site: tarballs.openstack.org
@ -379,7 +377,6 @@
- project: - project:
name: zmq-event-publisher name: zmq-event-publisher
maven-group-id: org.jenkins-ci.plugins
github-org: openstack-infra github-org: openstack-infra
node: precise node: precise
tarball-site: tarballs.openstack.org tarball-site: tarballs.openstack.org