diff options
| author | Zuul <zuul@review.opendev.org> | 2020-02-19 11:10:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-02-19 11:10:10 +0000 |
| commit | b86730a545584f2d387af26aea3cfd02d40be7de (patch) | |
| tree | 03d111b42ab471e4f7e91c1034b5b9149eb588d8 | |
| parent | 357d6111e9e40302087b7c919f2fd6063521437a (diff) | |
| parent | 0e2ae0e84a5b9e2a89a589944ca8c9260c5b5d63 (diff) | |
| download | kolla-b86730a545584f2d387af26aea3cfd02d40be7de.tar.gz kolla-b86730a545584f2d387af26aea3cfd02d40be7de.zip | |
Merge "CI: Replace cinder-lvm scenario with zun scenario" into stable/train
| -rw-r--r-- | .zuul.d/centos.yaml | 4 | ||||
| -rw-r--r-- | .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 9910aade0..b50e2837f 100644 --- a/.zuul.d/centos.yaml +++ b/.zuul.d/centos.yaml @@ -23,8 +23,8 @@ 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-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 d50570a9e..d968dd904 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: 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-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: |
