diff --git a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml index f75def41ba..1a783651bc 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml @@ -151,6 +151,11 @@ builders: - shell: "/usr/local/jenkins/slave_scripts/run-unittests.sh py {github-org} {project}" +- builder: + name: tox + builders: + - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh {envlist} {github-org} {project}" + - builder: name: assert-no-extra-files builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml index f3879350b9..282c2192dc 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -1497,6 +1497,16 @@ - python-jobs - pypi-jobs - hook-{name}-rtfd + - gate-{name}-tox-{envlist}: + envlist: wsme-stable + - gate-{name}-tox-{envlist}: + envlist: wsme-tip + - gate-{name}-tox-{envlist}: + envlist: ceilometer-stable + - gate-{name}-tox-{envlist}: + envlist: ceilometer-tip + - gate-{name}-tox-{envlist}: + envlist: ironic-tip - project: name: python-tuskarclient diff --git a/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml index 6d25e95deb..5a8abfbaba 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml @@ -153,6 +153,28 @@ node: '{node}' +- job-template: + name: 'gate-{name}-tox-{envlist}' + + wrappers: + - timeout: + timeout: 40 + fail: true + - timestamps + + builders: + - gerrit-git-prep + - tox: + envlist: '{envlist}' + github-org: '{github-org}' + project: '{name}' + - assert-no-extra-files + + publishers: + - test-results + - console-log + + node: '{node}' - job-template: name: '{name}-tarball' @@ -222,3 +244,5 @@ - '{name}-tarball' - '{name}-branch-tarball' # pylint isn't standard + # gate-{name}-tox-{envlist} also isn't standard, but is reserved for + # projects that want to run specific jobs via tox diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index ccf7426ed5..d9b6a99167 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -3389,11 +3389,21 @@ projects: - gate-pecan-python26 - gate-pecan-python27 - gate-pecan-python33 + - gate-pecan-tox-wsme-stable + - gate-pecan-tox-wsme-tip + - gate-pecan-tox-ceilometer-stable + - gate-pecan-tox-ceilometer-tip + - gate-pecan-tox-ironic-tip gate: - gate-pecan-pep8 - gate-pecan-python26 - gate-pecan-python27 - gate-pecan-python33 + - gate-pecan-tox-wsme-stable + - gate-pecan-tox-wsme-tip + - gate-pecan-tox-ceilometer-stable + - gate-pecan-tox-ceilometer-tip + - gate-pecan-tox-ironic-tip post: - pecan-branch-tarball pre-release: