diff --git a/jenkins/jobs/api-jobs.yaml b/jenkins/jobs/api-jobs.yaml index de44b37d76..ad1ad2417b 100644 --- a/jenkins/jobs/api-jobs.yaml +++ b/jenkins/jobs/api-jobs.yaml @@ -1,6 +1,6 @@ - job: name: openstack-api-ref - node: ubuntu-trusty + node: ubuntu-xenial builders: - gerrit-git-prep @@ -25,7 +25,7 @@ - job: name: openstack-api-ref-publish-lang - node: ubuntu-trusty + node: ubuntu-xenial builders: - gerrit-git-prep @@ -46,7 +46,7 @@ - job: name: gate-build-swagger description: Build and publish draft Swagger files from WADL migration. - node: ubuntu-trusty + node: ubuntu-xenial builders: - gerrit-git-prep @@ -64,7 +64,7 @@ - job-template: name: gate-{name}-api-guide description: Build and draft the API Guide from source. - node: ubuntu-trusty + node: ubuntu-xenial builders: - zuul-git-prep-upper-constraints @@ -80,7 +80,7 @@ - job-template: name: '{name}-api-guide' description: Build and publish the API Guide from source. - node: ubuntu-trusty + node: ubuntu-xenial builders: - zuul-git-prep-upper-constraints @@ -114,7 +114,7 @@ - job-template: name: gate-{name}-api-ref description: Build and draft the API Reference from source. - node: ubuntu-trusty + node: ubuntu-xenial builders: - zuul-git-prep-upper-constraints @@ -130,7 +130,7 @@ - job-template: name: '{name}-api-ref' description: Build and publish the API Reference from source. - node: ubuntu-trusty + node: ubuntu-xenial builders: - zuul-git-prep-upper-constraints @@ -164,7 +164,7 @@ - job: name: python-openstacksdk-docs description: Build and publish the Python SDK docs from source. - node: ubuntu-trusty + node: ubuntu-xenial builders: - gerrit-git-prep diff --git a/jenkins/jobs/manuals-jobs.yaml b/jenkins/jobs/manuals-jobs.yaml index 03a4883583..fa19b3240f 100644 --- a/jenkins/jobs/manuals-jobs.yaml +++ b/jenkins/jobs/manuals-jobs.yaml @@ -63,14 +63,18 @@ - job-group: name: openstack-doc-jobs jobs: - - gate-{name}-tox-{envlist}: + - gate-{name}-tox-{envlist}-{node}: envlist: checklinks - - gate-{name}-tox-{envlist}: + node: ubuntu-xenial + - gate-{name}-tox-{envlist}-{node}: envlist: checkniceness - - gate-{name}-tox-{envlist}: + node: ubuntu-xenial + - gate-{name}-tox-{envlist}-{node}: envlist: checksyntax - - gate-{name}-tox-{envlist}: + node: ubuntu-xenial + - gate-{name}-tox-{envlist}-{node}: envlist: checkdeletions + node: ubuntu-xenial - gate-{name}-tox-doc-publish-{envlist}: envlist: checkbuild - '{name}-tox-doc-{envlist}': diff --git a/jenkins/jobs/python-jobs.yaml b/jenkins/jobs/python-jobs.yaml index f35cd27f0e..ee9184ebd2 100644 --- a/jenkins/jobs/python-jobs.yaml +++ b/jenkins/jobs/python-jobs.yaml @@ -388,6 +388,30 @@ - console-log +- job-template: + name: 'gate-{name}-tox-{envlist}-{node}' + description: 'Runs tox, does not set up any databases.' + node: '{node}' + + 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 + - job-template: name: 'gate-{name}-tox-with-sudo-{envlist}' description: 'Same job as gate-{name}-tox-{envlist}, allows sudo access.' diff --git a/jenkins/jobs/translation-jobs.yaml b/jenkins/jobs/translation-jobs.yaml index 5fe9d136bf..abd4f2f004 100644 --- a/jenkins/jobs/translation-jobs.yaml +++ b/jenkins/jobs/translation-jobs.yaml @@ -77,7 +77,8 @@ jobs: - '{name}-upstream-translation-update' - '{name}-propose-translation-update{suffix}' - - 'gate-{name}-tox-{envlist}': + - 'gate-{name}-tox-{envlist}-{node}': envlist: checklang + node: ubuntu-xenial - '{name}-tox-doc-{envlist}': envlist: publishlang diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 09f7ae0347..a233a82077 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -652,32 +652,32 @@ 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-checklinks-ubuntu-xenial + - gate-{name}-tox-checkniceness-ubuntu-xenial + - gate-{name}-tox-checksyntax-ubuntu-xenial + - gate-{name}-tox-checkdeletions-ubuntu-xenial - gate-{name}-tox-doc-publish-checkbuild gate: - - gate-{name}-tox-checkniceness - - gate-{name}-tox-checksyntax - - gate-{name}-tox-checkdeletions + - gate-{name}-tox-checkniceness-ubuntu-xenial + - gate-{name}-tox-checksyntax-ubuntu-xenial + - gate-{name}-tox-checkdeletions-ubuntu-xenial - 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-checkniceness-ubuntu-xenial - gate-{name}-tox-doc-publish-checkbuild gate: - - gate-{name}-tox-checkniceness + - gate-{name}-tox-checkniceness-ubuntu-xenial - gate-{name}-tox-doc-publish-checkbuild - name: openstack-doc-translation check: - - 'gate-{name}-tox-checklang' + - gate-{name}-tox-checklang-ubuntu-xenial gate: - - 'gate-{name}-tox-checklang' + - gate-{name}-tox-checklang-ubuntu-xenial post: - '{name}-upstream-translation-update' - '{name}-tox-doc-publishlang' @@ -1500,7 +1500,7 @@ jobs: - name: propose-openstack-manuals-updates branch: master - - name: gate-openstack-manuals-tox-checksyntax + - name: gate-openstack-manuals-tox-checksyntax-ubuntu-xenial branch: ^(stable/liberty).*$ # Packstack integration jobs should only run on master and stable/mitaka @@ -2112,19 +2112,19 @@ jobs: - name: ^gate-.*-tox-doc-publish-checkbuild.*$ success-pattern: http://docs-draft.openstack.org/{build.parameters[LOG_PATH]}/publish-docs/ - - name: ^gate-.*-tox-checklang$ + - name: ^gate-.*-tox-checklang.*$ # Only run job if at least one po or pot file was changed files: - '^.*\.po$' - '^.*\.pot$' - - name: ^gate-.*-tox-checklinks$ + - name: ^gate-.*-tox-checklinks-ubuntu-xenial$ branch: master voting: false files: - '^.*\.xml$' - - name: ^gate-.*-tox-checksyntax$ + - name: ^gate-.*-tox-checksyntax-ubuntu-xenial$ files: - '^.*\.ent$' - '^.*\.po$' @@ -2611,7 +2611,7 @@ jobs: files: - '^apidocs/.*$' - - name: gate-trove-tox-checklinks + - name: ^gate-trove-tox-checklinks files: - '^apidocs/.*$' @@ -4853,10 +4853,10 @@ projects: - name: openstack-doc-gate - name: openstack-doc-translation check: - - gate-api-site-tox-checklang + - gate-api-site-tox-checklang-ubuntu-xenial - gate-build-swagger gate: - - gate-api-site-tox-checklang + - gate-api-site-tox-checklang-ubuntu-xenial - gate-build-swagger post: - api-site-upstream-translation-update @@ -10046,9 +10046,9 @@ projects: - name: translation-jobs-mitaka - name: release-notes-jobs check: - - gate-openstack-manuals-tox-checksyntax + - gate-openstack-manuals-tox-checksyntax-ubuntu-xenial gate: - - gate-openstack-manuals-tox-checksyntax + - gate-openstack-manuals-tox-checksyntax-ubuntu-xenial post: - openstack-manuals-tox-doc-publishdocs - propose-openstack-manuals-updates @@ -14001,7 +14001,7 @@ projects: - gate-trove-tox-doc-publish-checkbuild - gate-trove-functional-dsvm-mysql - gate-tempest-dsvm-trove - - gate-trove-tox-checklinks + - gate-trove-tox-checklinks-ubuntu-xenial - gate-trove-scenario-functional-dsvm-redis - gate-trove-scenario-functional-dsvm-mysql gate: