Remove support for sahara and senlin

Code Issues Proposed changes

Both of these projects were retired some cycles ago.
Change-Id: Ie7a3d5850800d2007e3676ad0bb25ed66f9100f6

This commit is contained in:

Takashi Kajinami

2025年05月28日 10:32:53 +09:00

parent a645fddf1d

commit 2fa2c92193

6 changed files with 7 additions and 28 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

10
defaults/main.yml

View File

@@ -146,12 +146,6 @@ tempest_plugin_novajoin_git_install_branch: master

tempest_plugin_octavia_git_repo:https://opendev.org/openstack/octavia-tempest-plugin

tempest_plugin_octavia_git_install_branch:master

tempest_plugin_senlin_git_repo:https://opendev.org/openstack/senlin-tempest-plugin

tempest_plugin_senlin_git_install_branch:master

tempest_plugin_sahara_git_repo:https://opendev.org/openstack/sahara-tests

tempest_plugin_sahara_git_install_branch:master

tempest_plugin_telemetry_git_repo:https://opendev.org/openstack/telemetry-tempest-plugin

tempest_plugin_telemetry_git_install_branch:master

@@ -265,8 +259,6 @@ tempest_service_available_neutron_vpnaas: >-

tempest_service_available_nova:"{{ groups['nova_all'] is defined and groups['nova_all'] | length > 0 }}"

tempest_service_available_novajoin:false

tempest_service_available_octavia:"{{ groups['octavia_all'] is defined and groups['octavia_all'] | length > 0 }}"

tempest_service_available_sahara:"{{ groups['sahara_all'] is defined and groups['sahara_all'] | length > 0 }}"

tempest_service_available_senlin:"{{ groups['senlin_all'] is defined and groups['senlin_all'] | length > 0 }}"

tempest_service_available_swift:>-

{{

(groups['swift_all'] is defined and groups['swift_all'] | length > 0) or

@@ -302,8 +294,6 @@ tempest_pip_packages:

- python-neutronclient

- python-novaclient

- python-openstackclient

- python-senlinclient

- python-saharaclient

- python-subunit

- python-swiftclient

- python-troveclient

5
releasenotes/notes/remove-sahara-and-senlin-f554022cdd27d7de.yaml Normal file

View File

@@ -0,0 +1,5 @@

---

upgrade:

- |

Support for Sahara plugin and Senlin plugin was removed, because these

projects were retired.

7
templates/tempest.conf.j2

View File

@@ -53,7 +53,6 @@ ceilometer = {{ tempest_service_available_ceilometer }}

ironic = {{ tempest_service_available_ironic }}

horizon = {{ tempest_service_available_horizon }}

aodh = {{ tempest_service_available_aodh }}

sahara = {{ tempest_service_available_sahara }}

zaqar = {{ tempest_service_available_zaqar }}

magnum = {{ tempest_service_available_magnum }}

manila = {{ tempest_service_available_manila }}

@@ -116,12 +115,6 @@ endpoint_type = {{ tempest_endpoint_type }}

{% endif %}

{% if tempest_service_available_sahara | bool %}

[data_processing]

endpoint_type = {{ tempest_endpoint_type }}

{% endif %}

{% if tempest_service_available_ceilometer | bool %}

[telemetry]

endpoint_type = {{ tempest_endpoint_type }}

4
tests/os_tempest-overrides.yml

View File

@@ -21,8 +21,8 @@ tempest_tempestconf_git_repo: https://opendev.org/openinfra/python-tempestconf

# A sample plugin to activate the code path

tempest_plugins:

- name:sahara-tests

repo:https://opendev.org/openstack/sahara-tests

- name:zaqar-tests

repo:https://opendev.org/openstack/zaqar-tempest-plugin

branch:master

install:true

8
vars/main.yml

View File

@@ -123,14 +123,6 @@ _tempest_plugins:

repo:"{{ tempest_plugin_octavia_git_repo }}"

branch:"{{ tempest_plugin_octavia_git_install_branch }}"

install:"{{ tempest_service_available_octavia | bool }}"

- name:senlin-tempest-plugin

repo:"{{ tempest_plugin_senlin_git_repo }}"

branch:"{{ tempest_plugin_senlin_git_install_branch }}"

install:"{{ tempest_service_available_senlin | bool }}"

- name:sahara-tests

repo:"{{ tempest_plugin_sahara_git_repo }}"

branch:"{{ tempest_plugin_sahara_git_install_branch }}"

install:"{{ tempest_service_available_sahara | bool }}"

- name:telemetry-tempest-plugin

repo:"{{ tempest_plugin_telemetry_git_repo }}"

branch:"{{ tempest_plugin_telemetry_git_install_branch }}"

1
vars/redhat.yml

View File

@@ -54,7 +54,6 @@ tempest_plugin_distro_packages:

- "{{ (tempest_service_available_neutron_vpnaas | bool) | ternary('python3-networking-vpnaas-tests', '') }}"

- "{{ (tempest_service_available_novajoin | bool) | ternary('python3-novajoin-tests-tempest', '') }}"

- "{{ (tempest_service_available_octavia | bool) | ternary('python3-octavia-tests-tempest', '') }}"

- "{{ (tempest_service_available_sahara | bool) | ternary('python3-sahara-tests-tempest', '') }}"

- "{{ (tempest_service_available_whitebox | bool) | ternary('python3-whitebox-tests-tempest', '') }}"

- "{{ (tempest_service_available_whitebox_neutron | bool) | ternary('python3-whitebox-neutron-tests-tempest', '') }}"

- "{{ (tempest_service_available_zaqar | bool) | ternary('python3-zaqar-tests-tempest', '') }}"