From 7a809e22a3098800c26d003b81ad7653504e63b6 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Wed, 15 Aug 2018 11:33:43 +0300 Subject: [PATCH] zuul: Drop distro jobs for Xenial and switch to smoke tests There will be no Rocky packages for Xenial so there is little point in testing Xenial against current and upcoming releases. As such, lets switch to Bionic. This also makes the functional jobs in Bionic voting again. In addition, this change switches to use smoke tests only because there is no upstream coverage to use the cinder_tempest_plugin which seems to have some broken jobs. It seems that we're currently configuring the LVM config after the service is setup which can cause it to go up with missing LVM configuration. This moves the tasks up so that the underlying storage is prepared before the service is installed and deployed. This is a squashed commit that covers a few topics because dropping the Xenial jobs fails because the cinder_tempest_plugin tests are failing. Also, the LVM config running later seems to cause the process to spin, possibly causing some troubles for RabbitMQ connectivity. Depends-On: https://review.openstack.org/#/c/591966/ Depends-On: https://review.openstack.org/#/c/591968/ Change-Id: I592691358f8dc587182052f9a079886dfc442744 --- tasks/main.yml | 14 +++++++------- tests/os_cinder-overrides.yml | 12 +----------- zuul.d/project.yaml | 10 ++-------- 3 files changed, 10 insertions(+), 26 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index b78f9609..5f77e348 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -40,6 +40,13 @@ tags: - always +- include: cinder_lvm_config.yml + when: + - "cinder_services['cinder-volume']['group'] in group_names" + - "cinder_backend_lvm_inuse | bool" + tags: + - cinder-config + - include: cinder_pre_install.yml tags: - cinder-install @@ -130,10 +137,3 @@ - "inventory_hostname == ((groups[cinder_services['cinder-api']['group']] | intersect(ansible_play_hosts)) | list)[-1]" tags: - cinder-config - -- include: cinder_lvm_config.yml - when: - - "cinder_services['cinder-volume']['group'] in group_names" - - "cinder_backend_lvm_inuse | bool" - tags: - - cinder-config diff --git a/tests/os_cinder-overrides.yml b/tests/os_cinder-overrides.yml index ebb2328c..481218da 100644 --- a/tests/os_cinder-overrides.yml +++ b/tests/os_cinder-overrides.yml @@ -14,15 +14,5 @@ # limitations under the License. tempest_run: yes - -# Cinder repo is needed because it's imported from cinder-tempest-plugin -tempest_plugins: - - name: cinder - repo: https://git.openstack.org/openstack/cinder - branch: master - - name: cinder-plugins - repo: https://git.openstack.org/openstack/cinder-tempest-plugin - branch: master - tempest_test_whitelist: - - cinder_tempest_plugin.api.volume.* + - smoke diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index ebb4a492..55ebffc5 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -19,18 +19,12 @@ jobs: - openstack-ansible-upgrade-ubuntu-xenial - openstack-ansible-cinder-ssl-nv - # TODO(jrosser) Revert this once bionic passes - - openstack-ansible-functional-ubuntu-bionic: - voting: false - - openstack-ansible-functional-distro_install-ubuntu-xenial - openstack-ansible-functional-distro_install-centos-7 - openstack-ansible-functional-distro_install-opensuse-423 + - openstack-ansible-functional-distro_install-ubuntu-bionic gate: jobs: - openstack-ansible-upgrade-ubuntu-xenial - # TODO(jrosser) Revert this once bionic passes - - openstack-ansible-functional-ubuntu-bionic: - voting: false - - openstack-ansible-functional-distro_install-ubuntu-xenial - openstack-ansible-functional-distro_install-centos-7 - openstack-ansible-functional-distro_install-opensuse-423 + - openstack-ansible-functional-distro_install-ubuntu-bionic