From 5b0894299ef8fca62f9d8eab7f0e229548da26cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Wed, 5 Feb 2020 18:25:18 +0100 Subject: [PATCH] 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: I339fc7f01f640a32ff35d19ded54b6f8e2fdec15 --- tests/run.yml | 4 ++-- tests/setup_disks.sh | 4 ++-- tests/templates/globals-default.j2 | 7 ------- tests/test-core-openstack.sh | 4 ++-- tools/setup_gate.sh | 7 ------- zuul.d/base.yaml | 15 ++------------- zuul.d/jobs.yaml | 16 ---------------- zuul.d/project.yaml | 4 ---- 8 files changed, 8 insertions(+), 53 deletions(-) diff --git a/tests/run.yml b/tests/run.yml index 6bc8e93606..205544fad5 100644 --- a/tests/run.yml +++ b/tests/run.yml @@ -21,7 +21,7 @@ need_build_image: false build_image_tag: "change_{{ zuul.change | default('none') }}" openstack_core_enabled: "{{ openstack_core_enabled }}" - openstack_core_tested: "{{ scenario in ['core', 'ceph', 'ceph-ansible', 'cinder-lvm', 'cells', 'swift'] }}" + openstack_core_tested: "{{ scenario in ['core', 'ceph', 'ceph-ansible', 'zun', 'cells', 'swift'] }}" dashboard_enabled: "{{ openstack_core_enabled }}" # TODO(mgoddard): Remove when previous_release is ussuri. playbook_python_version: "{{ '2' if is_upgrade and previous_release == 'train' else '3' }}" @@ -34,7 +34,7 @@ - name: Prepare disks for a storage service script: "setup_disks.sh {{ disk_type }}" - when: scenario in ['cinder-lvm', 'ceph', 'ceph-ansible', 'zun', 'swift'] + when: scenario in ['ceph', 'ceph-ansible', 'zun', 'swift'] become: true vars: disk_type: "{{ ceph_storetype if scenario in ['ceph', 'ceph-ansible'] else scenario }}" diff --git a/tests/setup_disks.sh b/tests/setup_disks.sh index bf0ab419be..3f4fe0169d 100644 --- a/tests/setup_disks.sh +++ b/tests/setup_disks.sh @@ -7,8 +7,8 @@ set -o errexit mkdir -p /opt/data/kolla -if [ $1 = 'cinder-lvm' ] || [ $1 = 'zun' ]; then - # cinder-volumes volume group +if [ $1 = 'zun' ]; then + # create cinder-volumes volume group for cinder lvm backend free_device=$(losetup -f) fallocate -l 5G /var/lib/cinder_data.img losetup $free_device /var/lib/cinder_data.img diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2 index 78cde87e1d..c7e6312ef3 100644 --- a/tests/templates/globals-default.j2 +++ b/tests/templates/globals-default.j2 @@ -74,13 +74,6 @@ ceph_osd_host_type: "INVENTORY" glance_enable_rolling_upgrade: "yes" {% endif %} -{% if scenario == "cinder-lvm" %} -enable_cinder: "yes" -# lvm backup driver for cinder-backup does not exist -enable_cinder_backup: "no" -enable_cinder_backend_lvm: "yes" -{% endif %} - {% if scenario == "zun" %} enable_zun: "yes" enable_kuryr: "yes" diff --git a/tests/test-core-openstack.sh b/tests/test-core-openstack.sh index 267b45f25a..c479ce5d37 100755 --- a/tests/test-core-openstack.sh +++ b/tests/test-core-openstack.sh @@ -11,7 +11,7 @@ function test_smoke { openstack --debug compute service list openstack --debug network agent list openstack --debug orchestration service list - if [[ $SCENARIO == "ceph" ]] || [[ $SCENARIO == "ceph-ansible" ]] | [[ $SCENARIO == "cinder-lvm" ]]; then + if [[ $SCENARIO == "ceph" ]] || [[ $SCENARIO == "ceph-ansible" ]] || [[ $SCENARIO == "zun" ]]; then openstack --debug volume service list fi } @@ -28,7 +28,7 @@ function test_instance_boot { fi echo "SUCCESS: Server creation" - if [[ $SCENARIO == "ceph" ]] || [ $SCENARIO == "ceph-ansible" ] || [[ $SCENARIO == "cinder-lvm" ]]; then + if [[ $SCENARIO == "ceph" ]] || [ $SCENARIO == "ceph-ansible" ] || [[ $SCENARIO == "zun" ]]; then echo "TESTING: Cinder volume attachment" openstack volume create --size 2 test_volume attempt=1 diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh index 3a7c412b1a..753b7313a3 100755 --- a/tools/setup_gate.sh +++ b/tools/setup_gate.sh @@ -43,13 +43,6 @@ function setup_config { GATE_IMAGES+=",^cinder" fi - if [[ $SCENARIO == "cinder-lvm" ]]; then - GATE_IMAGES+=",^cinder,^iscsid" - if [[ $BASE_DISTRO != "centos" ]] || [[ $BASE_DISTRO_MAJOR_VERSION -eq 7 ]]; then - GATE_IMAGES+=",^tgtd" - fi - fi - if [[ $SCENARIO == "zun" ]]; then GATE_IMAGES+=",^zun,^kuryr,^etcd,^cinder,^iscsid" if [[ $BASE_DISTRO != "centos" ]] || [[ $BASE_DISTRO_MAJOR_VERSION -eq 7 ]]; then diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 3799e03021..7631849e82 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -85,8 +85,9 @@ parent: kolla-ansible-base voting: false files: - - ^ansible/roles/(zun|kuryr|etcd)/ + - ^ansible/roles/(zun|kuryr|etcd|cinder|iscsi)/ - ^tests/setup_disks.sh + - ^tests/test-core-openstack.sh - ^tests/test-zun.sh - ^tests/test-dashboard.sh vars: @@ -120,18 +121,6 @@ - name: github.com/ceph/ceph-ansible override-checkout: v4.0.7 -- job: - name: kolla-ansible-cinder-lvm-base - parent: kolla-ansible-base - voting: false - files: - - ^ansible/roles/(cinder|iscsi)/ - - ^tests/setup_disks.sh - - ^tests/test-core-openstack.sh - - ^tests/test-dashboard.sh - vars: - scenario: cinder-lvm - - job: name: kolla-ansible-masakari-base parent: kolla-ansible-base diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 57862be2c8..75c0616165 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -95,22 +95,6 @@ base_distro: ubuntu install_type: source -- job: - name: kolla-ansible-ubuntu-source-cinder-lvm - parent: kolla-ansible-cinder-lvm-base - nodeset: kolla-ansible-bionic-multi - vars: - base_distro: ubuntu - install_type: source - -- job: - name: kolla-ansible-centos-source-cinder-lvm - parent: kolla-ansible-cinder-lvm-base - nodeset: kolla-ansible-centos-multi - vars: - base_distro: centos - install_type: source - - job: name: kolla-ansible-centos-source-mariadb parent: kolla-ansible-mariadb-base diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index fa73906c1a..81c5fbbb0d 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -17,8 +17,6 @@ - kolla-ansible-ubuntu-source-multinode-ipv6 - kolla-ansible-ubuntu-source-ceph - kolla-ansible-centos-source-ceph - - kolla-ansible-ubuntu-source-cinder-lvm - - kolla-ansible-centos-source-cinder-lvm - kolla-ansible-bifrost-centos-source - kolla-ansible-centos-source-zun - kolla-ansible-ubuntu-source-zun @@ -61,8 +59,6 @@ - kolla-ansible-ubuntu-source-masakari - kolla-ansible-centos-source-masakari - kolla-ansible-centos-source-scenario-nfv - - kolla-ansible-ubuntu-source-cinder-lvm - - kolla-ansible-centos-source-cinder-lvm - kolla-ansible-centos-source-ironic - kolla-ansible-centos-binary-ironic - kolla-ansible-ubuntu-source-ironic