Simplify zuul.yaml

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

Change-Id: If95e82202551612dc4ff9f1411c32e34399f51dd
Signed-off-by: Pete Birley <pete@port.direct>
This commit is contained in:
Pete Birley 2018-09-13 06:36:57 -05:00
parent 274b230dcc
commit 78ba9a4b6f

View File

@ -18,73 +18,29 @@
check: check:
jobs: jobs:
- openstack-helm-infra-linter - openstack-helm-infra-linter
- openstack-helm-infra-ubuntu: - openstack-helm-infra-ubuntu
irrelevant-files: - openstack-helm-infra-centos
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- openstack-helm-infra-centos:
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- openstack-helm-infra-dev-deploy-ceph: - openstack-helm-infra-dev-deploy-ceph:
# NOTE(srwilkers): Changing the dev-deploy-ceph job to nonvoting # NOTE(srwilkers): Changing the dev-deploy-ceph job to nonvoting
# until we can agree on the proper services to deploy with this job # until we can agree on the proper services to deploy with this job
voting: false voting: false
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- openstack-helm-infra-dev-deploy-nfs: - openstack-helm-infra-dev-deploy-nfs:
#NOTE(srwilkers): Changing the dev-deploy-nfs job to nonvoting until #NOTE(srwilkers): Changing the dev-deploy-nfs job to nonvoting until
# we can agree on the proper services to deploy with this job # we can agree on the proper services to deploy with this job
voting: false voting: false
irrelevant-files: - openstack-helm-infra-openstack-support
- ^.*\.rst$ - openstack-helm-infra-kubernetes-keystone-auth
- ^doc/.*$
- ^releasenotes/.*$
- openstack-helm-infra-openstack-support:
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- openstack-helm-infra-kubernetes-keystone-auth:
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
gate: gate:
jobs: jobs:
- openstack-helm-infra-linter - openstack-helm-infra-linter
- openstack-helm-infra-ubuntu: - openstack-helm-infra-ubuntu
irrelevant-files: - openstack-helm-infra-centos
- ^.*\.rst$ - openstack-helm-infra-openstack-support
- ^doc/.*$ - openstack-helm-infra-kubernetes-keystone-auth
- ^releasenotes/.*$
- openstack-helm-infra-centos:
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- openstack-helm-infra-openstack-support:
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- openstack-helm-infra-kubernetes-keystone-auth:
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
experimental: experimental:
jobs: jobs:
#NOTE(srwilkers): Make fedora job experimental until issues resolved #NOTE(srwilkers): Make fedora job experimental until issues resolved
- openstack-helm-infra-fedora: - openstack-helm-infra-fedora
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- nodeset: - nodeset:
name: openstack-helm-single-node name: openstack-helm-single-node
@ -223,6 +179,13 @@
- node-3 - node-3
- node-4 - node-4
- job:
name: openstack-helm-infra-functional
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- job: - job:
name: openstack-helm-infra-linter name: openstack-helm-infra-linter
run: playbooks/zuul-linter.yaml run: playbooks/zuul-linter.yaml
@ -230,6 +193,7 @@
- job: - job:
name: openstack-helm-infra name: openstack-helm-infra
parent: openstack-helm-functional
timeout: 7200 timeout: 7200
pre-run: pre-run:
- playbooks/osh-infra-upgrade-host.yaml - playbooks/osh-infra-upgrade-host.yaml
@ -256,6 +220,7 @@
- job: - job:
name: openstack-helm-infra-dev-deploy-ceph name: openstack-helm-infra-dev-deploy-ceph
parent: openstack-helm-functional
timeout: 7200 timeout: 7200
pre-run: playbooks/osh-infra-upgrade-host.yaml pre-run: playbooks/osh-infra-upgrade-host.yaml
run: playbooks/osh-infra-dev-deploy-ceph.yaml run: playbooks/osh-infra-dev-deploy-ceph.yaml
@ -264,6 +229,7 @@
- job: - job:
name: openstack-helm-infra-dev-deploy-nfs name: openstack-helm-infra-dev-deploy-nfs
parent: openstack-helm-functional
timeout: 7200 timeout: 7200
pre-run: playbooks/osh-infra-upgrade-host.yaml pre-run: playbooks/osh-infra-upgrade-host.yaml
run: playbooks/osh-infra-dev-deploy-nfs.yaml run: playbooks/osh-infra-dev-deploy-nfs.yaml
@ -272,6 +238,7 @@
- job: - job:
name: openstack-helm-infra-openstack-support name: openstack-helm-infra-openstack-support
parent: openstack-helm-functional
timeout: 7200 timeout: 7200
pre-run: playbooks/osh-infra-upgrade-host.yaml pre-run: playbooks/osh-infra-upgrade-host.yaml
run: playbooks/osh-infra-openstack-support.yaml run: playbooks/osh-infra-openstack-support.yaml