Update Zuul configuration

Couple of cleanups:
* Use openstack-lower-constraints-jobs template instead of
  individual jobs.
* The repo has both openstack-python36-jobs and extra cinder-tox-py36
  jobs, remove the cinder specific ones in benefit of the global one.
* Replace job cinder-tox-functional-py36 with
  openstack-tox-functional-py36.
* Separate job lines with empty line for better readability.
* Remove extra branches lines, those are wrong - each branch has its own
  .zuul.yaml file.

Change-Id: I6897cd0bb2386d31b8b17355cd88d9b42cf98fac
This commit is contained in:
Andreas Jaeger 2018-09-10 13:01:55 +02:00
parent cb16d7d7d3
commit 7c192b6d25
1 changed files with 3 additions and 41 deletions

View File

@ -1,5 +1,6 @@
- project:
templates:
- openstack-lower-constraints-jobs
- openstack-python-jobs
- openstack-python35-jobs
- openstack-python36-jobs
@ -17,7 +18,6 @@
voting: false
- nova-multiattach
- openstack-tox-functional-py35:
branches: ^(?!driverfixes/).*$
irrelevant-files:
- ^.*\.rst$
- ^api-ref/.*$
@ -27,9 +27,7 @@
- ^contrib/block-box.*$
- ^doc/.*$
- ^releasenotes/.*$
- openstack-tox-lower-constraints
- cinder-tox-functional-py36
- cinder-tox-py36
- openstack-tox-functional-py36
- cinder-rally-task:
voting: false
- openstack-tox-pylint:
@ -154,7 +152,6 @@
- cinder-tox-compliance
- nova-multiattach
- openstack-tox-functional-py35:
branches: ^(?!driverfixes/).*$
irrelevant-files:
- ^.*\.rst$
- ^api-ref/.*$
@ -164,8 +161,6 @@
- ^contrib/block-box.*$
- ^doc/.*$
- ^releasenotes/.*$
- openstack-tox-lower-constraints
- legacy-grenade-dsvm-cinder-mn-sub-volbak:
irrelevant-files:
- ^(test-|)requirements.txt$
@ -346,6 +341,7 @@
post:
jobs:
- publish-loci-cinder
- job:
# Previously named legacy-tempest-dsvm-full-lio
name: cinder-tempest-dsvm-lvm-lio-barbican
@ -408,40 +404,6 @@
- ^releasenotes/.*$
- ^setup.cfg$
- ^tools/.*$
- job:
# Testing running on bionic
name: cinder-tox-functional-py36
parent: openstack-tox
nodeset: ubuntu-bionic
vars:
tox_envlist: functional-py36
irrelevant-files:
- ^.*\.rst$
- ^api-ref/.*$
- ^cinder/hacking/.*$
- ^cinder/locale/.*$
- ^cinder/tests/unit.*$
- ^contrib/block-box.*$
- ^doc/.*$
- ^releasenotes/.*$
- ^tools/.*$
- job:
# Testing running on bionic
name: cinder-tox-py36
parent: openstack-tox
nodeset: ubuntu-bionic
vars:
tox_envlist: py36
irrelevant-files:
- ^.*\.rst$
- ^api-ref/.*$
- ^cinder/hacking/.*$
- ^cinder/locale/.*$
- ^cinder/tests/functional.*$
- ^contrib/block-box.*$
- ^doc/.*$
- ^releasenotes/.*$
- ^tools/.*$
- job:
name: cinder-rally-task