Simplify zuul.yaml

This relies on inheritence to reduce the parameters of the jobs
and make sure things are easier to read.

Change-Id: Ia615e6c8007d465a01c34239cd1acee65e333f83
This commit is contained in:
Jean-Philippe Evrard 2018-09-13 00:39:27 +02:00 committed by Tin Lam
parent dc1ac1c196
commit 5e2ee89fd8

View File

@ -18,149 +18,61 @@
check: check:
jobs: jobs:
- openstack-helm-linter - openstack-helm-linter
- openstack-helm-dev-deploy-ceph-swift-ovs: - openstack-helm-dev-deploy-ceph-swift-ovs
irrelevant-files: - openstack-helm-dev-deploy-ceph-radosgw-ovs
- ^.*\.rst$ - openstack-helm-dev-deploy-ceph-rbd-ovs
- ^doc/.*$ - openstack-helm-dev-deploy-nfs-ovs
- ^releasenotes/.*$
- openstack-helm-dev-deploy-ceph-radosgw-ovs:
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- openstack-helm-dev-deploy-ceph-rbd-ovs:
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- openstack-helm-dev-deploy-nfs-ovs:
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- openstack-helm-dev-deploy-ceph-lb: - openstack-helm-dev-deploy-ceph-lb:
voting: false voting: false
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- openstack-helm-dev-deploy-nfs-lb: - openstack-helm-dev-deploy-nfs-lb:
voting: false voting: false
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- openstack-helm-dev-deploy-nfs-ldap: - openstack-helm-dev-deploy-nfs-ldap:
voting: false voting: false
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- openstack-helm-multinode-ubuntu: - openstack-helm-multinode-ubuntu:
voting: false voting: false
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- openstack-helm-ironic-ubuntu: - openstack-helm-ironic-ubuntu:
voting: false voting: false
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- openstack-helm-armada-fullstack-deploy: - openstack-helm-armada-fullstack-deploy:
voting: false voting: false
irrelevant-files: - openstack-helm-kolla-deploy-ceph-ovs
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- openstack-helm-kolla-deploy-ceph-ovs:
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- openstack-helm-ocata-loci-deploy-ceph: - openstack-helm-ocata-loci-deploy-ceph:
voting: false voting: false
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- openstack-helm-ocata-kolla-deploy-ceph: - openstack-helm-ocata-kolla-deploy-ceph:
voting: false voting: false
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- openstack-helm-pike-loci-deploy-ceph: - openstack-helm-pike-loci-deploy-ceph:
voting: false voting: false
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- openstack-helm-pike-kolla-deploy-ceph: - openstack-helm-pike-kolla-deploy-ceph:
voting: false voting: false
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
gate: gate:
jobs: jobs:
- openstack-helm-linter: - openstack-helm-linter
irrelevant-files: - openstack-helm-dev-deploy-ceph-swift-ovs
- ^.*\.rst$ - openstack-helm-dev-deploy-ceph-radosgw-ovs
- ^doc/.*$ - openstack-helm-dev-deploy-ceph-rbd-ovs
- ^releasenotes/.*$ - openstack-helm-dev-deploy-nfs-ovs
- openstack-helm-dev-deploy-ceph-swift-ovs: - openstack-helm-kolla-deploy-ceph-ovs
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- openstack-helm-dev-deploy-ceph-radosgw-ovs:
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- openstack-helm-dev-deploy-ceph-rbd-ovs:
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- openstack-helm-dev-deploy-nfs-ovs:
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- openstack-helm-kolla-deploy-ceph-ovs:
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
experimental: experimental:
jobs: jobs:
- openstack-helm-multinode-centos: - openstack-helm-multinode-centos
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
# NOTE(lamt): Make fedora job experimental until issues with gates are resolved. # NOTE(lamt): Make fedora job experimental until issues with gates are resolved.
- openstack-helm-multinode-fedora: - openstack-helm-multinode-fedora
irrelevant-files: - openstack-helm-multinode-tempest
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- openstack-helm-multinode-tempest:
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- job: - job:
name: openstack-helm-linter name: openstack-helm-linter
run: tools/gate/playbooks/zuul-linter.yaml run: tools/gate/playbooks/zuul-linter.yaml
nodeset: openstack-helm-single-node nodeset: openstack-helm-single-node
- job:
name: openstack-helm-functional
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- job: - job:
name: openstack-helm-dev-deploy name: openstack-helm-dev-deploy
parent: openstack-helm-functional
roles: roles:
- zuul: openstack/openstack-helm-infra - zuul: openstack/openstack-helm-infra
timeout: 7200 timeout: 7200
@ -226,6 +138,7 @@
- job: - job:
name: openstack-helm-multinode name: openstack-helm-multinode
parent: openstack-helm-functional
roles: roles:
- zuul: openstack/openstack-helm-infra - zuul: openstack/openstack-helm-infra
vars: vars: