From ccecadfbf8437d1e2bd14b44432ab06fee1ddec0 Mon Sep 17 00:00:00 2001 From: Radosław Piliszek Date: Tue, 8 Dec 2020 20:36:10 +0100 Subject: [CI] Slim down Move all extra jobs to the experimental pipeline. Cores should know when to test these extras. This is to reduce the load when a fix is needed in the base image or across all images. Otherwise, due to how CI works, we incur the cost of running all these jobs on each recheck. Change-Id: Ia4aecd2fbe70d1760e0ddc401d06510914dbd1fb (cherry picked from commit 5797c3aa1a0402db9dc159df165b1fe97fc3df45) --- .zuul.d/centos.yaml | 45 +++++++++++++++++++++++---------------------- .zuul.d/ubuntu.yaml | 20 +++++++++++--------- 2 files changed, 34 insertions(+), 31 deletions(-) diff --git a/.zuul.d/centos.yaml b/.zuul.d/centos.yaml index 4da1fce30..b598374e5 100644 --- a/.zuul.d/centos.yaml +++ b/.zuul.d/centos.yaml @@ -19,27 +19,6 @@ - ^requirements.txt$ - ^setup.cfg$ - ^setup.py$ - - kolla-ansible-bifrost-centos-source: - files: ^docker\/(base|bifrost|openstack-base)\/.* - - kolla-ansible-centos8-source-bifrost: - files: ^docker\/(base|bifrost|openstack-base)\/.* - # Test rabbitmq & mariadb changes in multinode ceph jobs. - - kolla-ansible-centos-source-ceph: - files: ^docker\/(base|ceph|cinder|glance|mariadb|openstack-base|rabbitmq)\/.* - - kolla-ansible-centos-source-upgrade-ceph: - files: ^docker\/(base|ceph|cinder|glance|mariadb|openstack-base|rabbitmq)\/.* - - kolla-ansible-centos-source-zun: - files: ^docker\/(base|cinder|etcd|iscsid|kuryr|openstack-base|zun)\/.* - - kolla-ansible-centos8-source-zun: - files: ^docker\/(base|cinder|etcd|iscsid|kuryr|openstack-base|zun)\/.* - - kolla-ansible-centos-source-scenario-nfv: - files: ^docker\/(base|barbican|heat|mistral|openstack-base|redis|tacker)\/.* - - kolla-ansible-centos8-source-scenario-nfv: - files: ^docker\/(base|barbican|heat|mistral|openstack-base|redis|tacker)\/.* - - kolla-ansible-centos-source-ironic: - files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.* - - kolla-ansible-centos8-source-ironic: - files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.* gate: queue: kolla jobs: @@ -51,7 +30,6 @@ - tripleo-build-containers-centos-7: voting: true files: - - ^.zuul.d/centos.yaml$ - ^docker/.*$ - ^kolla/.*$ - ^requirements.txt$ @@ -69,6 +47,29 @@ - kolla-publish-centos-binary - kolla-publish-centos8-source - kolla-publish-centos8-binary + experimental: + jobs: + - kolla-ansible-bifrost-centos-source: + files: ^docker\/(base|bifrost|openstack-base)\/.* + - kolla-ansible-centos8-source-bifrost: + files: ^docker\/(base|bifrost|openstack-base)\/.* + # Test rabbitmq & mariadb changes in multinode ceph jobs. + - kolla-ansible-centos-source-ceph: + files: ^docker\/(base|ceph|cinder|glance|mariadb|openstack-base|rabbitmq)\/.* + - kolla-ansible-centos-source-upgrade-ceph: + files: ^docker\/(base|ceph|cinder|glance|mariadb|openstack-base|rabbitmq)\/.* + - kolla-ansible-centos-source-zun: + files: ^docker\/(base|cinder|etcd|iscsid|kuryr|openstack-base|zun)\/.* + - kolla-ansible-centos8-source-zun: + files: ^docker\/(base|cinder|etcd|iscsid|kuryr|openstack-base|zun)\/.* + - kolla-ansible-centos-source-scenario-nfv: + files: ^docker\/(base|barbican|heat|mistral|openstack-base|redis|tacker)\/.* + - kolla-ansible-centos8-source-scenario-nfv: + files: ^docker\/(base|barbican|heat|mistral|openstack-base|redis|tacker)\/.* + - kolla-ansible-centos-source-ironic: + files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.* + - kolla-ansible-centos8-source-ironic: + files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.* - job: name: kolla-build-centos-binary diff --git a/.zuul.d/ubuntu.yaml b/.zuul.d/ubuntu.yaml index d968dd904..6e60adcc0 100644 --- a/.zuul.d/ubuntu.yaml +++ b/.zuul.d/ubuntu.yaml @@ -7,15 +7,6 @@ - kolla-ansible-ubuntu-source - kolla-ansible-ubuntu-binary - kolla-ansible-ubuntu-source-upgrade - # Test rabbitmq and mariadb in multinode ceph jobs. - - kolla-ansible-ubuntu-source-ceph: - files: ^docker\/(base|ceph|cinder|glance|mariadb|openstack-base|rabbitmq)\/.* - - kolla-ansible-ubuntu-source-upgrade-ceph: - files: ^docker\/(base|ceph|cinder|glance|mariadb|openstack-base|rabbitmq)\/.* - - kolla-ansible-ubuntu-source-zun: - files: ^docker\/(base|cinder|etcd|iscsid|kuryr|openstack-base|zun)\/.* - - kolla-ansible-ubuntu-source-ironic: - files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.* gate: queue: kolla jobs: @@ -30,6 +21,17 @@ jobs: - kolla-publish-ubuntu-source - kolla-publish-ubuntu-binary + experimental: + jobs: + # Test rabbitmq and mariadb in multinode ceph jobs. + - kolla-ansible-ubuntu-source-ceph: + files: ^docker\/(base|ceph|cinder|glance|mariadb|openstack-base|rabbitmq)\/.* + - kolla-ansible-ubuntu-source-upgrade-ceph: + files: ^docker\/(base|ceph|cinder|glance|mariadb|openstack-base|rabbitmq)\/.* + - kolla-ansible-ubuntu-source-zun: + files: ^docker\/(base|cinder|etcd|iscsid|kuryr|openstack-base|zun)\/.* + - kolla-ansible-ubuntu-source-ironic: + files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.* - job: name: kolla-build-ubuntu-binary -- cgit v1.2.3