From 2e1f3ba63175ee497f443d7a24d653e0b6fd1759 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 23 Feb 2016 09:20:30 +0100 Subject: [PATCH] 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 --- jenkins/jobs/api-jobs.yaml | 23 ------------ jenkins/jobs/manuals-jobs.yaml | 67 ++++++++++++++-------------------- jenkins/jobs/python-jobs.yaml | 25 +++++++++++++ zuul/layout.yaml | 45 ++++++++--------------- 4 files changed, 69 insertions(+), 91 deletions(-) diff --git a/jenkins/jobs/api-jobs.yaml b/jenkins/jobs/api-jobs.yaml index 31d2c60da8..4fd58583d0 100644 --- a/jenkins/jobs/api-jobs.yaml +++ b/jenkins/jobs/api-jobs.yaml @@ -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: name: openstack-api-ref node: bare-trusty diff --git a/jenkins/jobs/manuals-jobs.yaml b/jenkins/jobs/manuals-jobs.yaml index d00878b545..0f191513c2 100644 --- a/jenkins/jobs/manuals-jobs.yaml +++ b/jenkins/jobs/manuals-jobs.yaml @@ -14,30 +14,6 @@ - job-template: 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 wrappers: @@ -60,29 +36,42 @@ - upload-docs-draft - 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: name: openstack-doc-jobs jobs: - - gate-{name}-tox-{envlist}: + - gate-{name}-tox-nodb-{envlist}: envlist: checklinks - - gate-{name}-tox-{envlist}: + - gate-{name}-tox-nodb-{envlist}: envlist: checkniceness - - gate-{name}-tox-{envlist}: + - gate-{name}-tox-nodb-{envlist}: envlist: checksyntax - - gate-{name}-tox-{envlist}: + - gate-{name}-tox-nodb-{envlist}: envlist: checkdeletions - gate-{name}-tox-doc-publish-{envlist}: envlist: checkbuild - '{name}-tox-doc-{envlist}': 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 diff --git a/jenkins/jobs/python-jobs.yaml b/jenkins/jobs/python-jobs.yaml index 95a55619cc..2f199ebc59 100644 --- a/jenkins/jobs/python-jobs.yaml +++ b/jenkins/jobs/python-jobs.yaml @@ -352,6 +352,31 @@ 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: name: '{name}-tarball' node: bare-trusty diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 3dc9330d86..b5cd519886 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -436,25 +436,25 @@ project-templates: # DocBook XML and RST files. - name: openstack-doc-gate check: - - gate-{name}-tox-checklinks - - gate-{name}-tox-checkniceness - - gate-{name}-tox-checksyntax - - gate-{name}-tox-checkdeletions + - gate-{name}-tox-nodb-checklinks + - gate-{name}-tox-nodb-checkniceness + - gate-{name}-tox-nodb-checksyntax + - gate-{name}-tox-nodb-checkdeletions - gate-{name}-tox-doc-publish-checkbuild gate: - - gate-{name}-tox-checkniceness - - gate-{name}-tox-checksyntax - - gate-{name}-tox-checkdeletions + - gate-{name}-tox-nodb-checkniceness + - gate-{name}-tox-nodb-checksyntax + - gate-{name}-tox-nodb-checkdeletions - gate-{name}-tox-doc-publish-checkbuild # Used for building documentation projects that contain # only RST files. - name: openstack-doc-rst-gate check: - - gate-{name}-tox-checkniceness + - gate-{name}-tox-nodb-checkniceness - gate-{name}-tox-doc-publish-checkbuild gate: - - gate-{name}-tox-checkniceness + - gate-{name}-tox-nodb-checkniceness - gate-{name}-tox-doc-publish-checkbuild - name: openstack-doc-translation @@ -684,14 +684,6 @@ project-templates: - gate-{name}-docs-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 experimental-tripleo: - gate-tripleo-ci-f22-nonha @@ -1478,13 +1470,13 @@ jobs: - '^.*\.po$' - '^.*\.pot$' - - name: ^gate-.*-tox-checklinks$ + - name: ^gate-.*-tox-nodb-checklinks$ branch: master voting: false files: - '^.*\.xml$' - - name: ^gate-.*-tox-checksyntax$ + - name: ^gate-.*-tox-nodb-checksyntax$ files: - '^.*\.ent$' - '^.*\.po$' @@ -1961,7 +1953,7 @@ jobs: files: - '^apidocs/.*$' - - name: gate-trove-tox-checklinks + - name: gate-trove-tox-nodb-checklinks files: - '^apidocs/.*$' @@ -3928,7 +3920,6 @@ projects: - name: merge-check - name: openstack-doc-gate - name: openstack-doc-translation - - name: experimental-docu-bindep-jobs check: - gate-api-site-tox-checklang - gate-build-swagger @@ -5805,7 +5796,6 @@ projects: - name: merge-check - name: openstack-doc-rst-gate - name: openstack-doc-translation - - name: experimental-docu-bindep-jobs post: - ha-guide-tox-doc-publishdocs @@ -7475,12 +7465,11 @@ projects: - name: openstack-doc-rst-gate - name: openstack-doc-translation - name: translation-jobs-liberty - - name: experimental-docu-bindep-jobs check: - - gate-openstack-manuals-tox-checklinks - - gate-openstack-manuals-tox-checksyntax + - gate-openstack-manuals-tox-nodb-checklinks + - gate-openstack-manuals-tox-nodb-checksyntax gate: - - gate-openstack-manuals-tox-checksyntax + - gate-openstack-manuals-tox-nodb-checksyntax post: - openstack-manuals-tox-doc-publishdocs - propose-openstack-manuals-updates @@ -7543,7 +7532,6 @@ projects: - name: merge-check - name: openstack-doc-gate - name: openstack-doc-translation - - name: experimental-docu-bindep-jobs post: - operations-guide-tox-doc-publishdocs @@ -9643,7 +9631,6 @@ projects: - name: merge-check - name: openstack-doc-rst-gate - name: openstack-doc-translation - - name: experimental-docu-bindep-jobs post: - security-doc-tox-doc-publishdocs @@ -10456,7 +10443,7 @@ projects: - name: translation-jobs - name: release-notes-jobs check: - - gate-trove-tox-checklinks + - gate-trove-tox-nodb-checklinks - gate-trove-tox-doc-publish-checkbuild - gate-trove-functional-dsvm-mysql - gate-tempest-dsvm-trove