Use bindep for manual jobs

Use ubuntu-trusty for most manual jobs.

* Remove experimental-docu-bindep-jobs.
* Create new gate-{name}-tox-nodb-{envlist} that uses bindep but does
  not setup databases.
* Move {name}-tox-doc-{envlist} from api-jobs to manuals-jobs and
  change to use bindep.
* Rename gate-{name}-tox-doc-publish-{envlist}-bindep to
  gate-{name}-tox-doc-publish-{envlist}.

Update everything in Zuul for these changes.

Change-Id: Ia075c2dfadd23ee7814b84d0813d56c3f6d872d2
This commit is contained in:
Andreas Jaeger 2016-02-23 09:20:30 +01:00
parent 6b71e8cac6
commit 2e1f3ba631
4 changed files with 69 additions and 91 deletions

View File

@ -1,26 +1,3 @@
- job-template:
name: '{name}-tox-doc-{envlist}'
wrappers:
- build-timeout:
timeout: 40
- timestamps
builders:
- print-template-name:
template-name: "{template-name}"
- revoke-sudo
- gerrit-git-prep
- tox:
envlist: '{envlist}'
publishers:
- console-log
- upload-to-docs-site
- upload-doc-build-results
node: '{node}'
- job: - job:
name: openstack-api-ref name: openstack-api-ref
node: bare-trusty node: bare-trusty

View File

@ -14,30 +14,6 @@
- job-template: - job-template:
name: 'gate-{name}-tox-doc-publish-{envlist}' name: 'gate-{name}-tox-doc-publish-{envlist}'
wrappers:
- build-timeout:
timeout: 40
- timestamps
builders:
- print-template-name:
template-name: "{template-name}"
- revoke-sudo
- gerrit-git-prep
- tox:
envlist: '{envlist}'
- assert-no-extra-files
publishers:
- console-log
- upload-docs-draft
- upload-doc-build-results
node: '{node}'
- job-template:
name: 'gate-{name}-tox-doc-publish-{envlist}-bindep'
node: ubuntu-trusty node: ubuntu-trusty
wrappers: wrappers:
@ -60,29 +36,42 @@
- upload-docs-draft - upload-docs-draft
- upload-doc-build-results - upload-doc-build-results
- job-template:
name: '{name}-tox-doc-{envlist}'
node: ubuntu-trusty
wrappers:
- build-timeout:
timeout: 40
- timestamps
builders:
- print-template-name:
template-name: "{template-name}"
- gerrit-git-prep
- install-distro-packages
- revoke-sudo
- tox:
envlist: '{envlist}'
publishers:
- console-log
- upload-to-docs-site
- upload-doc-build-results
- job-group: - job-group:
name: openstack-doc-jobs name: openstack-doc-jobs
jobs: jobs:
- gate-{name}-tox-{envlist}: - gate-{name}-tox-nodb-{envlist}:
envlist: checklinks envlist: checklinks
- gate-{name}-tox-{envlist}: - gate-{name}-tox-nodb-{envlist}:
envlist: checkniceness envlist: checkniceness
- gate-{name}-tox-{envlist}: - gate-{name}-tox-nodb-{envlist}:
envlist: checksyntax envlist: checksyntax
- gate-{name}-tox-{envlist}: - gate-{name}-tox-nodb-{envlist}:
envlist: checkdeletions envlist: checkdeletions
- gate-{name}-tox-doc-publish-{envlist}: - gate-{name}-tox-doc-publish-{envlist}:
envlist: checkbuild envlist: checkbuild
- '{name}-tox-doc-{envlist}': - '{name}-tox-doc-{envlist}':
envlist: publishdocs envlist: publishdocs
# Experimental bindep jobs
- gate-{name}-tox-{envlist}-bindep:
envlist: checklinks
- gate-{name}-tox-{envlist}-bindep:
envlist: checkniceness
- gate-{name}-tox-{envlist}-bindep:
envlist: checksyntax
- gate-{name}-tox-{envlist}-bindep:
envlist: checkdeletions
- gate-{name}-tox-doc-publish-{envlist}-bindep:
envlist: checkbuild

View File

@ -352,6 +352,31 @@
node: '{node}' node: '{node}'
- job-template:
name: 'gate-{name}-tox-nodb-{envlist}'
description: 'Same job as gate-{name}-tox-{envlist} but using bindep and not setting up databases.'
node: ubuntu-trusty
wrappers:
- build-timeout:
timeout: 40
- timestamps
builders:
- print-template-name:
template-name: "{template-name}"
- zuul-git-prep-upper-constraints
- install-distro-packages
- revoke-sudo
- tox:
envlist: '{envlist}'
- assert-no-extra-files
publishers:
- test-results
- console-log
- zuul-swift-test-results-with-console
- job-template: - job-template:
name: '{name}-tarball' name: '{name}-tarball'
node: bare-trusty node: bare-trusty

View File

@ -436,25 +436,25 @@ project-templates:
# DocBook XML and RST files. # DocBook XML and RST files.
- name: openstack-doc-gate - name: openstack-doc-gate
check: check:
- gate-{name}-tox-checklinks - gate-{name}-tox-nodb-checklinks
- gate-{name}-tox-checkniceness - gate-{name}-tox-nodb-checkniceness
- gate-{name}-tox-checksyntax - gate-{name}-tox-nodb-checksyntax
- gate-{name}-tox-checkdeletions - gate-{name}-tox-nodb-checkdeletions
- gate-{name}-tox-doc-publish-checkbuild - gate-{name}-tox-doc-publish-checkbuild
gate: gate:
- gate-{name}-tox-checkniceness - gate-{name}-tox-nodb-checkniceness
- gate-{name}-tox-checksyntax - gate-{name}-tox-nodb-checksyntax
- gate-{name}-tox-checkdeletions - gate-{name}-tox-nodb-checkdeletions
- gate-{name}-tox-doc-publish-checkbuild - gate-{name}-tox-doc-publish-checkbuild
# Used for building documentation projects that contain # Used for building documentation projects that contain
# only RST files. # only RST files.
- name: openstack-doc-rst-gate - name: openstack-doc-rst-gate
check: check:
- gate-{name}-tox-checkniceness - gate-{name}-tox-nodb-checkniceness
- gate-{name}-tox-doc-publish-checkbuild - gate-{name}-tox-doc-publish-checkbuild
gate: gate:
- gate-{name}-tox-checkniceness - gate-{name}-tox-nodb-checkniceness
- gate-{name}-tox-doc-publish-checkbuild - gate-{name}-tox-doc-publish-checkbuild
- name: openstack-doc-translation - name: openstack-doc-translation
@ -684,14 +684,6 @@ project-templates:
- gate-{name}-docs-bindep - gate-{name}-docs-bindep
- gate-{name}-requirements-bindep - gate-{name}-requirements-bindep
- name: experimental-docu-bindep-jobs
experimental:
- gate-{name}-tox-checklinks-bindep
- gate-{name}-tox-checkniceness-bindep
- gate-{name}-tox-checksyntax-bindep
- gate-{name}-tox-checkdeletions-bindep
- gate-{name}-tox-doc-publish-checkbuild-bindep
- name: experimental-tripleo-jobs - name: experimental-tripleo-jobs
experimental-tripleo: experimental-tripleo:
- gate-tripleo-ci-f22-nonha - gate-tripleo-ci-f22-nonha
@ -1478,13 +1470,13 @@ jobs:
- '^.*\.po$' - '^.*\.po$'
- '^.*\.pot$' - '^.*\.pot$'
- name: ^gate-.*-tox-checklinks$ - name: ^gate-.*-tox-nodb-checklinks$
branch: master branch: master
voting: false voting: false
files: files:
- '^.*\.xml$' - '^.*\.xml$'
- name: ^gate-.*-tox-checksyntax$ - name: ^gate-.*-tox-nodb-checksyntax$
files: files:
- '^.*\.ent$' - '^.*\.ent$'
- '^.*\.po$' - '^.*\.po$'
@ -1961,7 +1953,7 @@ jobs:
files: files:
- '^apidocs/.*$' - '^apidocs/.*$'
- name: gate-trove-tox-checklinks - name: gate-trove-tox-nodb-checklinks
files: files:
- '^apidocs/.*$' - '^apidocs/.*$'
@ -3928,7 +3920,6 @@ projects:
- name: merge-check - name: merge-check
- name: openstack-doc-gate - name: openstack-doc-gate
- name: openstack-doc-translation - name: openstack-doc-translation
- name: experimental-docu-bindep-jobs
check: check:
- gate-api-site-tox-checklang - gate-api-site-tox-checklang
- gate-build-swagger - gate-build-swagger
@ -5805,7 +5796,6 @@ projects:
- name: merge-check - name: merge-check
- name: openstack-doc-rst-gate - name: openstack-doc-rst-gate
- name: openstack-doc-translation - name: openstack-doc-translation
- name: experimental-docu-bindep-jobs
post: post:
- ha-guide-tox-doc-publishdocs - ha-guide-tox-doc-publishdocs
@ -7475,12 +7465,11 @@ projects:
- name: openstack-doc-rst-gate - name: openstack-doc-rst-gate
- name: openstack-doc-translation - name: openstack-doc-translation
- name: translation-jobs-liberty - name: translation-jobs-liberty
- name: experimental-docu-bindep-jobs
check: check:
- gate-openstack-manuals-tox-checklinks - gate-openstack-manuals-tox-nodb-checklinks
- gate-openstack-manuals-tox-checksyntax - gate-openstack-manuals-tox-nodb-checksyntax
gate: gate:
- gate-openstack-manuals-tox-checksyntax - gate-openstack-manuals-tox-nodb-checksyntax
post: post:
- openstack-manuals-tox-doc-publishdocs - openstack-manuals-tox-doc-publishdocs
- propose-openstack-manuals-updates - propose-openstack-manuals-updates
@ -7543,7 +7532,6 @@ projects:
- name: merge-check - name: merge-check
- name: openstack-doc-gate - name: openstack-doc-gate
- name: openstack-doc-translation - name: openstack-doc-translation
- name: experimental-docu-bindep-jobs
post: post:
- operations-guide-tox-doc-publishdocs - operations-guide-tox-doc-publishdocs
@ -9643,7 +9631,6 @@ projects:
- name: merge-check - name: merge-check
- name: openstack-doc-rst-gate - name: openstack-doc-rst-gate
- name: openstack-doc-translation - name: openstack-doc-translation
- name: experimental-docu-bindep-jobs
post: post:
- security-doc-tox-doc-publishdocs - security-doc-tox-doc-publishdocs
@ -10456,7 +10443,7 @@ projects:
- name: translation-jobs - name: translation-jobs
- name: release-notes-jobs - name: release-notes-jobs
check: check:
- gate-trove-tox-checklinks - gate-trove-tox-nodb-checklinks
- gate-trove-tox-doc-publish-checkbuild - gate-trove-tox-doc-publish-checkbuild
- gate-trove-functional-dsvm-mysql - gate-trove-functional-dsvm-mysql
- gate-tempest-dsvm-trove - gate-tempest-dsvm-trove