diff options
| author | Zuul <zuul@review.opendev.org> | 2020-02-07 13:21:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-02-07 13:21:41 +0000 |
| commit | c864b8c6a62561b136eb2dec61fc58efc44fcac5 (patch) | |
| tree | fd95454f7d7282d9235a8c641a516dfbaf6a720f | |
| parent | 10570292f4e801b653124d5fc1ac1611f9d2f007 (diff) | |
| parent | a7c2e4b34c91bbe947490940da23bc0f6ea4867c (diff) | |
| download | kolla-c864b8c6a62561b136eb2dec61fc58efc44fcac5.tar.gz kolla-c864b8c6a62561b136eb2dec61fc58efc44fcac5.zip | |
Merge "CI: Replace cinder-lvm scenario with zun scenario"
| -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 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: |