From 2785cc791ecd1f362957b6202ce313d5cfffe451 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 10 Sep 2018 21:50:54 +0200 Subject: [PATCH] Cleanup zuul.yaml Couple of cleanups: * Use openstack-lower-constraints-template, remove jobs that are part of templates. * Use openstack-tox-cover template, this runs the cover job in the check queue only. Remove post job. * Sort list of jobs and templates * Use dsvm-irrelevant-files for newly imported jobs Change-Id: Ibce77d3442e21bbd5f5ce379c203542f1f31ce9e --- .zuul.yaml | 398 ++++++++--------------------------------------------- 1 file changed, 60 insertions(+), 338 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 73929ef45133..d3e0cb4db491 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -149,14 +149,16 @@ - project: # Please try to keep the list of job names sorted alphabetically. templates: - - openstack-python-jobs - - openstack-python35-jobs - - openstack-python36-jobs - - publish-openstack-docs-pti - - periodic-stable-jobs - check-requirements - integrated-gate - integrated-gate-py35 + - openstack-cover-jobs + - openstack-lower-constraints-jobs + - openstack-python-jobs + - openstack-python35-jobs + - openstack-python36-jobs + - periodic-stable-jobs + - publish-openstack-docs-pti - release-notes-jobs-python3 check: jobs: @@ -165,361 +167,81 @@ - ironic-tempest-dsvm-ipa-wholedisk-bios-agent_ipmitool-tinyipa: voting: false irrelevant-files: *dsvm-irrelevant-files + - legacy-tempest-dsvm-full-devstack-plugin-ceph: + voting: false + irrelevant-files: *dsvm-irrelevant-files + - legacy-grenade-dsvm-neutron-multinode-live-migration: + voting: false + irrelevant-files: *dsvm-irrelevant-files + - neutron-grenade: + irrelevant-files: *dsvm-irrelevant-files + - neutron-grenade-multinode: + irrelevant-files: *dsvm-irrelevant-files + - neutron-tempest-linuxbridge: + irrelevant-files: *dsvm-irrelevant-files - nova-cells-v1 - nova-live-migration - nova-lvm - nova-multiattach - nova-next - - tempest-slow: - irrelevant-files: *dsvm-irrelevant-files - nova-tox-functional - nova-tox-functional-py35 - - openstack-tox-lower-constraints + - tempest-full: + irrelevant-files: *dsvm-irrelevant-files - tempest-full-py3: irrelevant-files: *dsvm-irrelevant-files - - neutron-grenade-multinode: - irrelevant-files: - - ^(placement-)?api-.*$ - - ^(test-|)requirements.txt$ - - ^.*\.rst$ - - ^.git.*$ - - ^doc/.*$ - - ^nova/hacking/.*$ - - ^nova/locale/.*$ - - ^nova/tests/.*$ - - ^releasenotes/.*$ - - ^setup.cfg$ - - ^tests-py3.txt$ - - ^tools/.*$ - - ^tox.ini$ - - legacy-grenade-dsvm-neutron-multinode-live-migration: - voting: false - irrelevant-files: - - ^(placement-)?api-.*$ - - ^(test-|)requirements.txt$ - - ^.*\.rst$ - - ^.git.*$ - - ^api-.*$ - - ^doc/.*$ - - ^nova/hacking/.*$ - - ^nova/locale/.*$ - - ^nova/tests/.*\.py$ - - ^nova/tests/functional/.*$ - - ^nova/tests/unit/.*$ - - ^releasenotes/.*$ - - ^setup.cfg$ - - ^tests-py3.txt$ - - ^tools/.*$ - - ^tox.ini$ - - legacy-tempest-dsvm-full-devstack-plugin-ceph: - voting: false - irrelevant-files: - - ^(placement-)?api-.*$ - - ^(test-|)requirements.txt$ - - ^.*\.rst$ - - ^.git.*$ - - ^doc/.*$ - - ^nova/hacking/.*$ - - ^nova/locale/.*$ - - ^nova/tests/.*$ - - ^releasenotes/.*$ - - ^setup.cfg$ - - ^tests-py3.txt$ - - ^tools/.*$ - - ^tox.ini$ - - neutron-tempest-linuxbridge: - irrelevant-files: - - ^(?!nova/network/.*)(?!nova/virt/libvirt/vif.py).*$ - - ^(placement-)?api-.*$ - - ^(test-|)requirements.txt$ - - ^.*\.rst$ - - ^.git.*$ - - ^doc/.*$ - - ^nova/hacking/.*$ - - ^nova/locale/.*$ - - ^nova/tests/.*$ - - ^releasenotes/.*$ - - ^setup.cfg$ - - ^tests-py3.txt$ - - ^tools/.*$ - - ^tox.ini$ - tempest-multinode-full: voting: false - irrelevant-files: - - ^(placement-)?api-.*$ - - ^(test-|)requirements.txt$ - - ^.*\.rst$ - - ^.git.*$ - - ^doc/.*$ - - ^nova/hacking/.*$ - - ^nova/locale/.*$ - - ^nova/tests/.*$ - - ^releasenotes/.*$ - - ^setup.cfg$ - - ^tests-py3.txt$ - - ^tools/.*$ - - ^tox.ini$ - - tempest-full: - irrelevant-files: - - ^(placement-)?api-.*$ - - ^(test-|)requirements.txt$ - - ^.*\.rst$ - - ^.git.*$ - - ^doc/.*$ - - ^nova/hacking/.*$ - - ^nova/locale/.*$ - - ^nova/tests/.*$ - - ^releasenotes/.*$ - - ^setup.cfg$ - - ^tests-py3.txt$ - - ^tools/.*$ - - ^tox.ini$ - - neutron-grenade: - irrelevant-files: - - ^(placement-)?api-.*$ - - ^(test-|)requirements.txt$ - - ^.*\.rst$ - - ^.git.*$ - - ^doc/.*$ - - ^nova/hacking/.*$ - - ^nova/locale/.*$ - - ^nova/tests/.*$ - - ^releasenotes/.*$ - - ^setup.cfg$ - - ^tests-py3.txt$ - - ^tools/.*$ - - ^tox.ini$ + irrelevant-files: *dsvm-irrelevant-files + - tempest-slow: + irrelevant-files: *dsvm-irrelevant-files gate: jobs: + - neutron-grenade: + irrelevant-files: *dsvm-irrelevant-files - nova-cells-v1 - nova-live-migration - nova-multiattach - - nova-next - - tempest-slow: - irrelevant-files: *dsvm-irrelevant-files - nova-tox-functional - nova-tox-functional-py35 - - openstack-tox-lower-constraints + - nova-next + - tempest-full: + irrelevant-files: *dsvm-irrelevant-files - tempest-full-py3: irrelevant-files: *dsvm-irrelevant-files - - tempest-full: - irrelevant-files: - - ^(placement-)?api-.*$ - - ^(test-|)requirements.txt$ - - ^.*\.rst$ - - ^.git.*$ - - ^doc/.*$ - - ^nova/hacking/.*$ - - ^nova/locale/.*$ - - ^nova/tests/.*$ - - ^releasenotes/.*$ - - ^setup.cfg$ - - ^tests-py3.txt$ - - ^tools/.*$ - - ^tox.ini$ - - neutron-grenade: - irrelevant-files: - - ^(placement-)?api-.*$ - - ^(test-|)requirements.txt$ - - ^.*\.rst$ - - ^.git.*$ - - ^doc/.*$ - - ^nova/hacking/.*$ - - ^nova/locale/.*$ - - ^nova/tests/.*$ - - ^releasenotes/.*$ - - ^setup.cfg$ - - ^tests-py3.txt$ - - ^tools/.*$ - - ^tox.ini$ + - tempest-slow: + irrelevant-files: *dsvm-irrelevant-files experimental: jobs: - - nova-caching-scheduler - - os-vif-ovs - - legacy-tempest-dsvm-nova-v20-api: - irrelevant-files: - - ^(placement-)?api-.*$ - - ^(test-|)requirements.txt$ - - ^.*\.rst$ - - ^.git.*$ - - ^doc/.*$ - - ^nova/hacking/.*$ - - ^nova/locale/.*$ - - ^nova/tests/.*$ - - ^releasenotes/.*$ - - ^setup.cfg$ - - ^tests-py3.txt$ - - ^tools/.*$ - - ^tox.ini$ - - legacy-tempest-dsvm-multinode-full: - irrelevant-files: - - ^(placement-)?api-.*$ - - ^(test-|)requirements.txt$ - - ^.*\.rst$ - - ^.git.*$ - - ^doc/.*$ - - ^nova/hacking/.*$ - - ^nova/locale/.*$ - - ^nova/tests/.*$ - - ^releasenotes/.*$ - - ^setup.cfg$ - - ^tests-py3.txt$ - - ^tools/.*$ - - ^tox.ini$ - - legacy-tempest-dsvm-neutron-dvr-multinode-full: - irrelevant-files: - - ^(placement-)?api-.*$ - - ^(test-|)requirements.txt$ - - ^.*\.rst$ - - ^.git.*$ - - ^doc/.*$ - - ^nova/hacking/.*$ - - ^nova/locale/.*$ - - ^nova/tests/.*$ - - ^releasenotes/.*$ - - ^setup.cfg$ - - ^tests-py3.txt$ - - ^tools/.*$ - - ^tox.ini$ - - neutron-tempest-dvr-ha-multinode-full: - irrelevant-files: - - ^(placement-)?api-.*$ - - ^(test-|)requirements.txt$ - - ^.*\.rst$ - - ^.git.*$ - - ^doc/.*$ - - ^nova/hacking/.*$ - - ^nova/locale/.*$ - - ^nova/tests/.*$ - - ^releasenotes/.*$ - - ^setup.cfg$ - - ^tests-py3.txt$ - - ^tools/.*$ - - ^tox.ini$ - - legacy-tempest-dsvm-neutron-src-oslo.versionedobjects: - irrelevant-files: - - ^(placement-)?api-.*$ - - ^(test-|)requirements.txt$ - - ^.*\.rst$ - - ^.git.*$ - - ^doc/.*$ - - ^nova/hacking/.*$ - - ^nova/locale/.*$ - - ^nova/tests/.*$ - - ^releasenotes/.*$ - - ^setup.cfg$ - - ^tests-py3.txt$ - - ^tools/.*$ - - ^tox.ini$ - - legacy-tempest-dsvm-nova-libvirt-kvm-apr: - irrelevant-files: - - ^(placement-)?api-.*$ - - ^(test-|)requirements.txt$ - - ^.*\.rst$ - - ^.git.*$ - - ^doc/.*$ - - ^nova/hacking/.*$ - - ^nova/locale/.*$ - - ^nova/tests/.*$ - - ^releasenotes/.*$ - - ^setup.cfg$ - - ^tests-py3.txt$ - - ^tools/.*$ - - ^tox.ini$ - - legacy-grenade-dsvm-neutron-multinode-zero-downtime: - irrelevant-files: - - ^(placement-)?api-.*$ - - ^(test-|)requirements.txt$ - - ^.*\.rst$ - - ^.git.*$ - - ^doc/.*$ - - ^nova/hacking/.*$ - - ^nova/locale/.*$ - - ^nova/tests/.*$ - - ^releasenotes/.*$ - - ^setup.cfg$ - - ^tests-py3.txt$ - - ^tools/.*$ - - ^tox.ini$ - - ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode: - irrelevant-files: - - ^(placement-)?api-.*$ - - ^.git.*$ - - ^nova/hacking/.*$ - - ^nova/locale/.*$ - - ^nova/tests/.*$ - - ^tests-py3.txt$ - ironic-tempest-dsvm-bfv: - # NOTE: Ironic boot from volume only works starting in stable/pike. - irrelevant-files: - - ^(placement-)?api-.*$ - - ^.git.*$ - - ^nova/hacking/.*$ - - ^nova/locale/.*$ - - ^nova/tests/.*$ - - ^tests-py3.txt$ - - legacy-tempest-dsvm-full-devstack-plugin-nfs: - irrelevant-files: - - ^(placement-)?api-.*$ - - ^(test-|)requirements.txt$ - - ^.*\.rst$ - - ^.git.*$ - - ^doc/.*$ - - ^nova/hacking/.*$ - - ^nova/locale/.*$ - - ^nova/tests/.*$ - - ^releasenotes/.*$ - - ^setup.cfg$ - - ^tests-py3.txt$ - - ^tools/.*$ - - ^tox.ini$ - - legacy-barbican-simple-crypto-dsvm-tempest-nova + irrelevant-files: *dsvm-irrelevant-files + - ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode: + irrelevant-files: *dsvm-irrelevant-files + - legacy-barbican-simple-crypto-dsvm-tempest-nova: + irrelevant-files: *dsvm-irrelevant-files - legacy-tempest-dsvm-py35-full-devstack-plugin-ceph: - irrelevant-files: - - ^(placement-)?api-.*$ - - ^(test-|)requirements.txt$ - - ^.*\.rst$ - - ^.git.*$ - - ^doc/.*$ - - ^nova/hacking/.*$ - - ^nova/locale/.*$ - - ^nova/tests/.*$ - - ^releasenotes/.*$ - - ^setup.cfg$ - - ^tests-py3.txt$ - - ^tools/.*$ - - ^tox.ini$ - - legacy-tempest-dsvm-neutron-pg-full: - irrelevant-files: - - ^(placement-)?api-.*$ - - ^(test-|)requirements.txt$ - - ^.*\.rst$ - - ^.git.*$ - - ^doc/.*$ - - ^nova/hacking/.*$ - - ^nova/locale/.*$ - - ^nova/tests/.*$ - - ^releasenotes/.*$ - - ^setup.cfg$ - - ^tests-py3.txt$ - - ^tools/.*$ - - ^tox.ini$ + irrelevant-files: *dsvm-irrelevant-files + - legacy-grenade-dsvm-neutron-multinode-zero-downtime: + irrelevant-files: *dsvm-irrelevant-files + - legacy-tempest-dsvm-full-devstack-plugin-nfs: + irrelevant-files: *dsvm-irrelevant-files + - legacy-tempest-dsvm-multinode-full: + irrelevant-files: *dsvm-irrelevant-files - legacy-tempest-dsvm-neutron-full-opensuse-423: - irrelevant-files: - - ^(placement-)?api-.*$ - - ^(test-|)requirements.txt$ - - ^.*\.rst$ - - ^.git.*$ - - ^doc/.*$ - - ^nova/hacking/.*$ - - ^nova/locale/.*$ - - ^nova/tests/.*$ - - ^releasenotes/.*$ - - ^setup.cfg$ - - ^tests-py3.txt$ - - ^tools/.*$ - - ^tox.ini$ - - post: - jobs: - - openstack-tox-cover + irrelevant-files: *dsvm-irrelevant-files + - legacy-tempest-dsvm-neutron-pg-full: + irrelevant-files: *dsvm-irrelevant-files + - legacy-tempest-dsvm-neutron-src-oslo.versionedobjects: + irrelevant-files: *dsvm-irrelevant-files + - legacy-tempest-dsvm-nova-libvirt-kvm-apr: + irrelevant-files: *dsvm-irrelevant-files + - legacy-tempest-dsvm-nova-v20-api: + irrelevant-files: *dsvm-irrelevant-files + - legacy-tempest-dsvm-neutron-dvr-multinode-full: + irrelevant-files: *dsvm-irrelevant-files + - neutron-tempest-dvr-ha-multinode-full: + irrelevant-files: *dsvm-irrelevant-files + - nova-caching-scheduler: + irrelevant-files: *dsvm-irrelevant-files + - os-vif-ovs: + irrelevant-files: *dsvm-irrelevant-files