openstack/project-config
Code Issues Proposed changes

Use job-template for publishing to ci.openstack.org

Browse Source 
Merge the various publishing jobs into a job template. The only
difference between them was the target and that the system-config one
used zuul_swift_upload_console_log.

The template now uses zuul_swift_upload_console_log for all the jobs.

The jobs using the template are now named "{name}-ci-docs" and needed to
be added to the jjb project and renamed in the zuul layout file.

Change-Id: I8772508ec9da4ba4b7d3bc37f85d260f80e836bc
This commit is contained in:
Andreas Jaeger 2014-11-28 11:11:26 +01:00
parent 47c9d1dd28
commit ab35650306
7 changed files with 23 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jenkins/jobs/infra.yaml
View File

@ -56,8 +56,8 @@
- console-log
# This is a non-standard docs job because it uses SCP instead of FTP
- job:
name: ci-docs
- job-template:
name: '{name}-ci-docs'
node: 'bare-precise || bare-trusty'
builders:
@ -69,9 +69,10 @@
publishers:
- scp:
# publish to ci.openstack.org
site: '173.203.107.207'
files:
- target: 'ci'
- target: '{target}'
source: 'doc/build/html/**/*'
keep-hierarchy: true
- console-log

19
jenkins/jobs/job-builder.yaml
View File

@ -1,22 +1,3 @@
# This is a non-standard docs job because it uses SCP instead of FTP
- job:
name: jenkins-job-builder-docs
node: 'bare-precise || bare-trusty'
builders:
- revoke-sudo
- gerrit-git-prep
- docs
publishers:
- scp:
site: '173.203.107.207'
files:
- target: 'ci/jenkins-job-builder'
source: 'doc/build/html/**/*'
keep-hierarchy: true
- console-log
- job:
name: jenkins-job-builder-compare-xml
node: 'bare-precise || bare-trusty'

18
jenkins/jobs/nodepool.yaml
View File

@ -1,18 +0,0 @@
# This is a non-standard docs job because it uses SCP instead of FTP
- job:
name: nodepool-docs
node: 'bare-precise || bare-trusty'
builders:
- revoke-sudo
- gerrit-git-prep
- docs
publishers:
- scp:
site: '173.203.107.207'
files:
- target: 'ci/nodepool'
source: 'doc/build/html/**/*'
keep-hierarchy: true
- console-log

11
jenkins/jobs/projects.yaml
View File

@ -1896,6 +1896,8 @@
jobs:
- python-jobs
- pypi-jobs
- '{name}-ci-docs':
target: 'ci/jenkins-job-builder'
- project:
name: nodepool
@ -1905,7 +1907,8 @@
jobs:
- python-jobs
- pypi-jobs
- '{name}-ci-docs':
target: 'ci/nodepool'
- project:
name: nose-html-output
@ -2097,6 +2100,8 @@
- precise
- trusty
- centos6
- '{name}-ci-docs':
target: 'ci'
- project:
name: vinz
@ -2106,6 +2111,8 @@
jobs:
- python-jobs
- pypi-jobs
- '{name}-ci-docs':
target: 'ci/vinz'
- project:
name: vinz-webclient
@ -2142,6 +2149,8 @@
jobs:
- python-jobs
- pypi-jobs
- '{name}-ci-docs':
target: 'ci/zuul'
########################################################################
# Section: Stackforge projects

18
jenkins/jobs/vinz.yaml
View File

@ -1,18 +0,0 @@
# This is a non-standard docs job because it uses SCP instead of FTP
- job:
name: vinz-docs
node: 'bare-precise || bare-trusty'
builders:
- revoke-sudo
- gerrit-git-prep
- docs
publishers:
- scp:
site: '173.203.107.207'
files:
- target: 'ci/vinz'
source: 'doc/build/html/**/*'
keep-hierarchy: true
- console-log

19
jenkins/jobs/zuul.yaml
View File

@ -1,22 +1,3 @@
# This is a non-standard docs job because it uses SCP instead of FTP
- job:
name: zuul-docs
node: 'bare-precise || bare-trusty'
builders:
- revoke-sudo
- gerrit-git-prep
- docs
publishers:
- scp:
site: '173.203.107.207'
files:
- target: 'ci/zuul'
source: 'doc/build/html/**/*'
keep-hierarchy: true
- console-log
- job:
name: 'dev-zuul-coverage'
node: 'bare-precise || bare-trusty'

18
zuul/layout.yaml
View File

@ -3336,7 +3336,7 @@ projects:
- jenkins-job-builder-compare-xml
- jenkins-job-builder-coverage
post:
- jenkins-job-builder-docs
- jenkins-job-builder-ci-docs
- jenkins-job-builder-coverage
- name: openstack-infra/lodgeit
@ -3355,7 +3355,7 @@ projects:
- name: python-jobs
- name: publish-to-pypi
post:
- nodepool-docs
- nodepool-ci-docs
- nodepool-coverage
- name: openstack-infra/nose-html-output
@ -3639,7 +3639,7 @@ projects:
- gate-system-config-puppet-syntax
- gate-ci-docs
post:
- ci-docs
- system-config-ci-docs
experimental:
- experimental-swift-logs-system-config-pep8-centos6
@ -3655,11 +3655,11 @@ projects:
- name: publish-to-pypi
- name: python-jobs
post:
- vinz-docs
- vinz-ci-docs
pre-release:
- vinz-docs
- vinz-ci-docs
release:
- vinz-docs
- vinz-ci-docs
- name: openstack-infra/vinz-webclient
template:
@ -3702,12 +3702,12 @@ projects:
gate:
- gate-zuul-python26
post:
- zuul-docs
- zuul-ci-docs
- zuul-coverage
pre-release:
- zuul-docs
- zuul-ci-docs
release:
- zuul-docs
- zuul-ci-docs
periodic:
- periodic-test