From 1900f0ff6bbef1651cc502e9e880244b19656554 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Mon, 24 Jan 2022 17:53:51 +0200 Subject: [PATCH] Deprecate congress and lxd tempest plugins Congress is no longer maintained and no reason to carry on it's tempest testing. LXD driver is also not supported by nova and project has been deprecated back in Train. Tempest tests for neutron vpnaas and bgpvpn were moved to neutron tempest plugin with [1] and [2] [1] https://opendev.org/openstack/neutron-vpnaas/commit/4077093c10b937b6ea98d565845f40816e4d1f63 [2] https://opendev.org/openstack/networking-bgpvpn/commit/44866dadba2595308c5fea41e03bd5d69a6e272e Change-Id: I161167b995a4cd3ee532719fa5fcf1f1a6cacb73 --- defaults/main.yml | 7 ------ ...precate_congress_lxd-9e1c00c6f93f32f6.yaml | 6 +++++ vars/main.yml | 22 +------------------ vars/redhat-7.yml | 1 - vars/redhat-8.yml | 1 - vars/redhat-9.yml | 1 - 6 files changed, 7 insertions(+), 31 deletions(-) create mode 100644 releasenotes/notes/deprecate_congress_lxd-9e1c00c6f93f32f6.yaml diff --git a/defaults/main.yml b/defaults/main.yml index d9c9d7e4..8838af50 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -187,7 +187,6 @@ tempest_service_available_barbican: "{{ groups['barbican_all'] is defined and gr tempest_service_available_ceilometer: "{{ groups['ceilometer_all'] is defined and groups['ceilometer_all'] | length > 0 }}" tempest_service_available_cinder: "{{ groups['cinder_all'] is defined and groups['cinder_all'] | length > 0 }}" tempest_service_available_cloudkitty: "{{ groups['cloudkitty_all'] is defined and groups['cloudkitty_all'] | length > 0 }}" -tempest_service_available_congress: "{{ groups['congress_all'] is defined and groups['congress_all'] | length > 0 }}" tempest_service_available_designate: "{{ groups['designate_all'] is defined and groups['designate_all'] | length > 0 }}" tempest_service_available_glance: "{{ groups['glance_all'] is defined and groups['glance_all'] | length > 0 }}" tempest_service_available_gnocchi: "{{ groups['gnocchi_all'] is defined and groups['gnocchi_all'] | length > 0 }}" @@ -203,12 +202,6 @@ tempest_service_available_neutron_bgpvpn: "{{ (groups['neutron_all'] is defined) tempest_service_available_neutron_vpnaas: "{{ (groups['neutron_all'] is defined) and (groups['neutron_all'] | length > 0) and ('vpnaas' in neutron_plugin_base | default([])) }}" tempest_service_available_nova: "{{ groups['nova_all'] is defined and groups['nova_all'] | length > 0 }}" tempest_service_available_novajoin: False -# NOTE(jrosser) The lxd tempest test currently fails because the nova-lxd tempest -# plugin attempts to contact the compute node LXD daemon unix socket directly, -# which cannot work from container to host or in a multinode test -#tempest_service_available_nova_lxd: "{{ groups['nova_all'] is defined and groups['nova_all'] | length > 0 and nova_virt_type | default('kvm') == 'lxd' }}" -tempest_service_available_nova_lxd: False - tempest_service_available_octavia: "{{ groups['octavia_all'] is defined and groups['octavia_all'] | length > 0 }}" tempest_service_available_panko: "{{ groups['panko_all'] is defined and groups['panko_all'] | length > 0 }}" tempest_service_available_sahara: "{{ groups['sahara_all'] is defined and groups['sahara_all'] | length > 0 }}" diff --git a/releasenotes/notes/deprecate_congress_lxd-9e1c00c6f93f32f6.yaml b/releasenotes/notes/deprecate_congress_lxd-9e1c00c6f93f32f6.yaml new file mode 100644 index 00000000..fe940b63 --- /dev/null +++ b/releasenotes/notes/deprecate_congress_lxd-9e1c00c6f93f32f6.yaml @@ -0,0 +1,6 @@ +--- +deprecations: + - | + Vaiables ``tempest_service_available_congress`` and + ``tempest_service_available_nova_lxd`` have been removed and have no effect + since corresponding services are not supported anymore. diff --git a/vars/main.yml b/vars/main.yml index 2ccece18..653ccc30 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -66,11 +66,6 @@ _tempest_plugins: repo: https://opendev.org/openstack/cloudkitty-tempest-plugin branch: master install: "{{ tempest_service_available_cloudkitty | bool }}" - congress: - - name: congress-tempest-plugin - repo: https://opendev.org/openstack/congress-tempest-plugin - branch: master - install: "{{ tempest_service_available_congress | bool }}" designate: - name: designate-tempest-plugin repo: https://opendev.org/openstack/designate-tempest-plugin @@ -106,31 +101,16 @@ _tempest_plugins: repo: https://opendev.org/openstack/murano-tempest-plugin branch: master install: "{{ tempest_service_available_murano | bool }}" - networking-bgpvpn: - - name: networking-bgpvpn - repo: https://opendev.org/openstack/networking-bgpvpn - branch: master - install: "{{ tempest_service_available_neutron_bgpvpn | bool }}" - neutron-vpnaas: - - name: neutron-vpnaas - repo: https://opendev.org/openstack/neutron-vpnaas - branch: master - install: "{{ tempest_service_available_neutron_vpnaas | bool }}" neutron: - name: neutron-tempest-plugin repo: https://opendev.org/openstack/neutron-tempest-plugin branch: master - install: "{{ tempest_service_available_neutron | bool }}" + install: "{{ tempest_service_available_neutron or tempest_service_available_neutron_bgpvpn or tempest_service_available_neutron_vpnaas }}" novajoin: - name: novajoin-tempest-plugin repo: https://opendev.org/openstack/novajoin-tempest-plugin branch: master install: "{{ tempest_service_available_novajoin | bool }}" - nova-lxd: - - name: nova-lxd - repo: https://opendev.org/x/nova-lxd - branch: master - install: "{{ tempest_service_available_nova_lxd | bool }}" octavia: - name: octavia-tempest-plugin repo: https://opendev.org/openstack/octavia-tempest-plugin diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml index 67f03dba..804d7805 100644 --- a/vars/redhat-7.yml +++ b/vars/redhat-7.yml @@ -33,7 +33,6 @@ tempest_plugin_distro_packages: - "{{ (tempest_service_available_barbican | bool) | ternary('python-barbican-tests-tempest', '') }}" - "{{ (tempest_service_available_ceilometer | bool) | ternary('python-telemetry-tests-tempest', '') }}" - "{{ (tempest_service_available_cinder | bool) | ternary('python-cinder-tests-tempest', '') }}" - - "{{ (tempest_service_available_congress | bool) | ternary('python-congress-tests-tempest', '') }}" - "{{ (tempest_service_available_designate | bool) | ternary('python-designate-tests-tempest', '') }}" - "{{ (tempest_service_available_heat | bool) | ternary('python-heat-tests-tempest', '') }}" - "{{ tempest_service_available_horizon | bool | ternary('python-horizon-tests-tempest', '') }}" diff --git a/vars/redhat-8.yml b/vars/redhat-8.yml index ea6498bf..807555aa 100644 --- a/vars/redhat-8.yml +++ b/vars/redhat-8.yml @@ -41,7 +41,6 @@ tempest_plugin_distro_packages: - "{{ (tempest_service_available_barbican | bool) | ternary('python3-barbican-tests-tempest', '') }}" - "{{ (tempest_service_available_ceilometer | bool) | ternary('python3-telemetry-tests-tempest', '') }}" - "{{ (tempest_service_available_cinder | bool) | ternary('python3-cinder-tests-tempest', '') }}" - - "{{ (tempest_service_available_congress | bool) | ternary('python3-congress-tests-tempest', '') }}" - "{{ (tempest_service_available_designate | bool) | ternary('python3-designate-tests-tempest', '') }}" - "{{ (tempest_service_available_heat | bool) | ternary('python3-heat-tests-tempest', '') }}" - "{{ (tempest_service_available_ironic | bool) | ternary('python3-ironic-tests-tempest', '') }}" diff --git a/vars/redhat-9.yml b/vars/redhat-9.yml index ea6498bf..807555aa 100644 --- a/vars/redhat-9.yml +++ b/vars/redhat-9.yml @@ -41,7 +41,6 @@ tempest_plugin_distro_packages: - "{{ (tempest_service_available_barbican | bool) | ternary('python3-barbican-tests-tempest', '') }}" - "{{ (tempest_service_available_ceilometer | bool) | ternary('python3-telemetry-tests-tempest', '') }}" - "{{ (tempest_service_available_cinder | bool) | ternary('python3-cinder-tests-tempest', '') }}" - - "{{ (tempest_service_available_congress | bool) | ternary('python3-congress-tests-tempest', '') }}" - "{{ (tempest_service_available_designate | bool) | ternary('python3-designate-tests-tempest', '') }}" - "{{ (tempest_service_available_heat | bool) | ternary('python3-heat-tests-tempest', '') }}" - "{{ (tempest_service_available_ironic | bool) | ternary('python3-ironic-tests-tempest', '') }}"