From a7c2e4b34c91bbe947490940da23bc0f6ea4867c Mon Sep 17 00:00:00 2001 From: Radosław Piliszek Date: Wed, 5 Feb 2020 18:33:32 +0100 Subject: CI: Replace cinder-lvm scenario with zun scenario As discussed during the meeting. [1] [1] http://eavesdrop.openstack.org/meetings/kolla/2020/kolla.2020-02-05-15.00.html Change-Id: Ie095590b82d6e1b3922d99178d3a4019626ab630 --- .zuul.d/centos.yaml | 4 ++-- .zuul.d/ubuntu.yaml | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.zuul.d/centos.yaml b/.zuul.d/centos.yaml index 117acdc35..fd83b97d8 100644 --- a/.zuul.d/centos.yaml +++ b/.zuul.d/centos.yaml @@ -25,8 +25,8 @@ files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.* - kolla-ansible-centos-source-upgrade-ceph-ansible: files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.* - - kolla-ansible-centos-source-cinder-lvm: - files: ^docker\/(base|cinder|iscsid|openstack-base)\/.* + - kolla-ansible-centos-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-centos-source-ironic: diff --git a/.zuul.d/ubuntu.yaml b/.zuul.d/ubuntu.yaml index c102f88e6..8ed20990b 100644 --- a/.zuul.d/ubuntu.yaml +++ b/.zuul.d/ubuntu.yaml @@ -7,15 +7,13 @@ - kolla-ansible-ubuntu-source - kolla-ansible-ubuntu-binary - kolla-ansible-ubuntu-source-upgrade - - kolla-ansible-ubuntu-source-zun: - files: ^docker\/(base|zun|kuryr|openstack-base)\/.* # Test rabbitmq and mariadb in multinode ceph jobs. - kolla-ansible-ubuntu-source-ceph-ansible: files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.* - kolla-ansible-ubuntu-source-upgrade-ceph-ansible: files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.* - - kolla-ansible-ubuntu-source-cinder-lvm: - files: ^docker\/(base|cinder|iscsid|openstack-base)\/.* + - 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: -- cgit v1.2.3