diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 29d9427191..a9b26b680b 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -260,7 +260,6 @@ jobs: - coverage-jobs - python-jobs - - 'gate-{name}-python35-nv' - hook-{name}-rtfd - 'gate-ara-integration-{python_version}-{ansible_version}-{ostype}{suffix}': python_version: py27 @@ -277,9 +276,12 @@ suffix: '-nv' - 'gate-ara-integration-{python_version}-{ansible_version}-{ostype}{suffix}': python_version: py35 - ansible_version: - - latest - - devel + ansible_version: latest + ostype: ubuntu-xenial + suffix: '' + - 'gate-ara-integration-{python_version}-{ansible_version}-{ostype}{suffix}': + python_version: py35 + ansible_version: devel ostype: ubuntu-xenial suffix: '-nv' - 'gate-ara-integration-openstack-ansible-func-{ostype}': diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 6e49df4394..bc1160fa00 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -5528,14 +5528,14 @@ projects: template: - name: merge-check - name: python-jobs - - name: python35-jobs-nv + - name: python35-jobs - name: docs-on-rtfd check: - gate-ara-integration-py27-2.1.6.0-centos-7 - gate-ara-integration-py27-2.2.3.0-centos-7 - gate-ara-integration-py27-latest-centos-7 - gate-ara-integration-py27-devel-centos-7-nv - - gate-ara-integration-py35-latest-ubuntu-xenial-nv + - gate-ara-integration-py35-latest-ubuntu-xenial - gate-ara-integration-py35-devel-ubuntu-xenial-nv - gate-ara-integration-openstack-ansible-func-centos-7 - gate-ara-integration-openstack-ansible-func-ubuntu-xenial @@ -5544,6 +5544,7 @@ projects: - gate-ara-integration-py27-2.1.6.0-centos-7 - gate-ara-integration-py27-2.2.3.0-centos-7 - gate-ara-integration-py27-latest-centos-7 + - gate-ara-integration-py35-latest-ubuntu-xenial - gate-ara-integration-openstack-ansible-func-centos-7 - gate-ara-integration-openstack-ansible-func-ubuntu-xenial post: